[pypy-svn] r67682 - pypy/trunk/pypy/jit/metainterp/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Sep 14 16:50:38 2009
New Revision: 67682

Added:
   pypy/trunk/pypy/jit/metainterp/test/test_recursive.py.merge.tmp
      - copied, changed from r67674, pypy/trunk/pypy/jit/metainterp/test/test_recursive.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/spine-of-frames/pypy/jit/metainterp/test/test_recursive.py
revisions 67428 to 67674:

    ------------------------------------------------------------------------
    r67628 | cfbolz | 2009-09-10 19:18:43 +0200 (Thu, 10 Sep 2009) | 3 lines
    
    do things in the other order, to make it possible to call stuff in the leave
    hook
    
    ------------------------------------------------------------------------
    r67624 | cfbolz | 2009-09-10 16:45:13 +0200 (Thu, 10 Sep 2009) | 2 lines
    
    merge in changes from revisions r67429 through r67623 of trunk.
    
    ------------------------------------------------------------------------
    r67429 | cfbolz | 2009-09-02 15:32:28 +0200 (Wed, 02 Sep 2009) | 2 lines
    
    a branch where to try to link frames together differently
    
    ------------------------------------------------------------------------


Copied: pypy/trunk/pypy/jit/metainterp/test/test_recursive.py.merge.tmp (from r67674, pypy/trunk/pypy/jit/metainterp/test/test_recursive.py)
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/test/test_recursive.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/test/test_recursive.py.merge.tmp	Mon Sep 14 16:50:38 2009
@@ -427,9 +427,12 @@
         def c(code, pc):
             return "L" not in hlstr(code)
 
-        def leave(code, pc, frame):
+        def really_leave(frame):
             frame.hookcalled = True
 
+        def leave(code, pc, frame):
+            really_leave(frame)
+
         class ExpectedHook(Exception):
             pass
         class UnexpectedHook(Exception):