Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r74515:1a994c305af0
Date: 2014-11-14 08:14 +0200
http://bitbucket.org/pypy/pypy/changeset/1a994c305af0/
Log: fix test_executor
diff --git a/rpython/jit/metainterp/test/test_executor.py
b/rpython/jit/metainterp/test/test_executor.py
--- a/rpython/jit/metainterp/test/test_executor.py
+++ b/rpython/jit/metainterp/test/test_executor.py
@@ -4,7 +4,7 @@
from rpython.rtyper.lltypesystem import lltype, llmemory
from rpython.jit.metainterp.executor import execute
from rpython.jit.metainterp.executor import execute_varargs, execute_nonspec
-from rpython.jit.metainterp.resoperation import rop, opboolinvers,
opboolreflex, opname
+from rpython.jit.metainterp.resoperation import rop, opname, opclasses
from rpython.jit.metainterp.history import BoxInt, ConstInt
from rpython.jit.metainterp.history import BoxPtr, ConstPtr
from rpython.jit.metainterp.history import BoxFloat, ConstFloat
@@ -343,7 +343,11 @@
def test_opboolinvers():
cpu = FakeCPU()
- for op1, op2 in opboolinvers.items():
+ for op1 in opclasses:
+ if op1 is None or op1.boolinverse == -1:
+ continue
+ op2 = opclasses[op1.boolinverse].opnum
+ op1 = op1.opnum
for a in (1,2,3):
for b in (1,2,3):
arg1, arg2 = make_args_for_op(op1, a, b)
@@ -353,7 +357,11 @@
def test_opboolreflex():
cpu = FakeCPU()
- for op1, op2 in opboolreflex.items():
+ for op1 in opclasses:
+ if op1 is None or op1.boolreflex == -1:
+ continue
+ op2 = opclasses[op1.boolreflex].opnum
+ op1 = op1.opnum
for a in (1,2,3):
for b in (1,2,3):
arg1, arg2 = make_args_for_op(op1, a, b)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
