Author: Hakan Ardo <ha...@debian.org>
Branch: jit-targets
Changeset: r48834:123a7a37c565
Date: 2011-11-06 18:54 +0100
http://bitbucket.org/pypy/pypy/changeset/123a7a37c565/
Log: fix tests
diff --git a/pypy/jit/metainterp/test/support.py
b/pypy/jit/metainterp/test/support.py
--- a/pypy/jit/metainterp/test/support.py
+++ b/pypy/jit/metainterp/test/support.py
@@ -228,7 +228,7 @@
# this can be used after interp_operations
if expected is not None:
expected = dict(expected)
- expected['jump'] = 1
+ expected['finish'] = 1
self.metainterp.staticdata.stats.check_history(expected, **isns)
diff --git a/pypy/jit/metainterp/test/test_ajit.py
b/pypy/jit/metainterp/test/test_ajit.py
--- a/pypy/jit/metainterp/test/test_ajit.py
+++ b/pypy/jit/metainterp/test/test_ajit.py
@@ -195,7 +195,7 @@
assert res == 1167
self.check_loop_count(3)
self.check_resops({'int_lt': 3, 'int_gt': 2, 'int_add': 5,
- 'guard_true': 3, 'int_sub': 4, 'jump': 4,
+ 'guard_true': 3, 'int_sub': 4, 'jump': 2,
'int_mul': 2, 'guard_false': 2})
def test_loop_invariant_mul_bridge_maintaining2(self):
@@ -215,7 +215,7 @@
assert res == 1692
self.check_loop_count(3)
self.check_resops({'int_lt': 3, 'int_gt': 2, 'int_add': 5,
- 'guard_true': 3, 'int_sub': 4, 'jump': 4,
+ 'guard_true': 3, 'int_sub': 4, 'jump': 2,
'int_mul': 2, 'guard_false': 2})
def test_loop_invariant_mul_bridge_maintaining3(self):
@@ -257,7 +257,7 @@
res = self.meta_interp(f, [6, 7])
assert res == 252
self.check_loop_count(1)
- self.check_resops({'jump': 2, 'int_gt': 2, 'int_add': 2,
+ self.check_resops({'jump': 1, 'int_gt': 2, 'int_add': 2,
'getfield_gc_pure': 1, 'int_mul': 1,
'guard_true': 2, 'int_sub': 2})
@@ -861,7 +861,7 @@
res = self.meta_interp(f, [6, 7])
assert res == 42.0
self.check_loop_count(1)
- self.check_resops({'jump': 2, 'float_gt': 2, 'float_add': 2,
+ self.check_resops({'jump': 1, 'float_gt': 2, 'float_add': 2,
'float_sub': 2, 'guard_true': 2})
def test_print(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
