[pypy-commit] pypy jit-targets: port tests

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-targets
Changeset: r50351:f95dbc2efd61
Date: 2011-12-10 15:20 +0100
http://bitbucket.org/pypy/pypy/changeset/f95dbc2efd61/

Log:	port tests

diff --git a/pypy/jit/metainterp/test/test_fficall.py b/pypy/jit/metainterp/test/test_fficall.py
--- a/pypy/jit/metainterp/test/test_fficall.py
+++ b/pypy/jit/metainterp/test/test_fficall.py
@@ -167,7 +167,7 @@
                 return f(data, n)
 
         assert self.meta_interp(main, [10]) == 2000
-        self.check_resops({'jump': 2, 'int_lt': 2, 'getinteriorfield_raw': 2,
+        self.check_resops({'jump': 1, 'int_lt': 2, 'getinteriorfield_raw': 2,
                            'guard_true': 2, 'int_add': 4})
 
 
diff --git a/pypy/jit/metainterp/test/test_recursive.py b/pypy/jit/metainterp/test/test_recursive.py
--- a/pypy/jit/metainterp/test/test_recursive.py
+++ b/pypy/jit/metainterp/test/test_recursive.py
@@ -1260,7 +1260,7 @@
                     return portal(level + 1)
 
         self.meta_interp(portal, [0])
-        self.check_loop_count_at_most(2)   # and not, e.g., 24
+        self.check_trace_count_at_most(2)   # and not, e.g., 24
 
 
 class TestLLtype(RecursiveTests, LLJitMixin):