[pypy-svn] r67649 - in pypy/trunk/pypy/jit: backend/test metainterp/test

[pedronis at codespeak.net]

Author: pedronis
Date: Fri Sep 11 11:19:04 2009
New Revision: 67649

Modified:
   pypy/trunk/pypy/jit/backend/test/support.py
   pypy/trunk/pypy/jit/metainterp/test/test_recursive.py
Log:
fix more indirect breakage from the agressive_inlining merge (the z tests are evil)



Modified: pypy/trunk/pypy/jit/backend/test/support.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/test/support.py	(original)
+++ pypy/trunk/pypy/jit/backend/test/support.py	Fri Sep 11 11:19:04 2009
@@ -76,6 +76,12 @@
     def check_enter_count_at_most(self, *args, **kwds):
         pass
 
+    def check_max_trace_length(self, *args, **kwds):
+        pass
+
+    def check_aborted_count(self, *args, **kwds):
+        pass
+
     def interp_operations(self, *args, **kwds):
         py.test.skip("interp_operations test skipped")
 

Modified: 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	Fri Sep 11 11:19:04 2009
@@ -343,6 +343,7 @@
                 if n < 50:
                     n = recursive(n)
                 n -= 1
+            return n
         TRACE_LIMIT = 20
         res = self.meta_interp(loop, [100], optimizer=OPTIMIZER_SIMPLE, inline=True, trace_limit=TRACE_LIMIT)
         self.check_max_trace_length(TRACE_LIMIT)