Author: Armin Rigo <[email protected]>
Branch: jit-simplify-backendintf
Changeset: r50417:5960a81ae802
Date: 2011-12-12 10:13 +0000
http://bitbucket.org/pypy/pypy/changeset/5960a81ae802/
Log: Fix tests
diff --git a/pypy/jit/metainterp/test/test_compile.py
b/pypy/jit/metainterp/test/test_compile.py
--- a/pypy/jit/metainterp/test/test_compile.py
+++ b/pypy/jit/metainterp/test/test_compile.py
@@ -172,8 +172,7 @@
result_type = INT
#
loop_token = compile_tmp_callback(cpu, FakeJitDriverSD(),
- [ConstInt(12), ConstInt(34)],
- [BoxInt(56), ConstInt(78), BoxInt(90)])
+ [ConstInt(12), ConstInt(34)], "ii")
#
raiseme = None
# only two arguments must be passed in
diff --git a/pypy/jit/metainterp/test/test_warmspot.py
b/pypy/jit/metainterp/test/test_warmspot.py
--- a/pypy/jit/metainterp/test/test_warmspot.py
+++ b/pypy/jit/metainterp/test/test_warmspot.py
@@ -348,8 +348,8 @@
def get_fail_descr_from_number(self, no):
return FakeFailDescr(no)
- def execute_token(self, token, *args):
- assert 0
+ def make_execute_token(self, *ARGS):
+ return "not callable"
driver = JitDriver(reds = ['red'], greens = ['green'])
diff --git a/pypy/jit/metainterp/test/test_warmstate.py
b/pypy/jit/metainterp/test/test_warmstate.py
--- a/pypy/jit/metainterp/test/test_warmstate.py
+++ b/pypy/jit/metainterp/test/test_warmstate.py
@@ -187,6 +187,7 @@
_confirm_enter_jit_ptr = None
_can_never_inline_ptr = None
_should_unroll_one_iteration_ptr = None
+ red_args_types = []
class FakeCell:
dont_trace_here = False
state = WarmEnterState(FakeWarmRunnerDesc(), FakeJitDriverSD())
@@ -216,6 +217,7 @@
_can_never_inline_ptr = None
_get_jitcell_at_ptr = None
_should_unroll_one_iteration_ptr = None
+ red_args_types = []
state = WarmEnterState(FakeWarmRunnerDesc(), FakeJitDriverSD())
state.make_jitdriver_callbacks()
res = state.get_location_str([ConstInt(5), constfloat(42.5)])
@@ -241,6 +243,7 @@
_can_never_inline_ptr = None
_get_jitcell_at_ptr = None
_should_unroll_one_iteration_ptr = None
+ red_args_types = []
state = WarmEnterState(FakeWarmRunnerDesc(), FakeJitDriverSD())
state.make_jitdriver_callbacks()
@@ -266,6 +269,7 @@
_can_never_inline_ptr = llhelper(CAN_NEVER_INLINE, can_never_inline)
_get_jitcell_at_ptr = None
_should_unroll_one_iteration_ptr = None
+ red_args_types = []
state = WarmEnterState(FakeWarmRunnerDesc(), FakeJitDriverSD())
state.make_jitdriver_callbacks()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
