[pypy-commit] pypy optresult-unroll: fix test_util.py

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r79470:4e33c7bf451c
Date: 2015-09-06 11:09 +0200
http://bitbucket.org/pypy/pypy/changeset/4e33c7bf451c/

Log:	fix test_util.py

diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -12,7 +12,7 @@
 from rpython.jit.metainterp.optimizeopt.util import sort_descrs, equaloplists
 from rpython.jit.codewriter.effectinfo import EffectInfo
 from rpython.jit.metainterp.logger import LogOperations
-from rpython.jit.tool.oparser import OpParser
+from rpython.jit.tool.oparser import OpParser, pure_parse
 from rpython.jit.metainterp.quasiimmut import QuasiImmutDescr
 from rpython.jit.metainterp import compile, resume, history
 from rpython.jit.metainterp.jitprof import EmptyProfiler
@@ -35,6 +35,12 @@
         sort_descrs(lst2)
         assert lst2 == lst
 
+def make_remap(inp1, inp2):
+    remap = {}
+    for a, b in zip(inp1, inp2):
+        remap[b] = a
+    return remap
+
 def test_equaloplists():
     ops = """
     [i0]
@@ -48,9 +54,12 @@
     loop2 = pure_parse(ops, namespace=namespace)
     loop3 = pure_parse(ops.replace("i2 = int_add", "i2 = int_sub"),
                        namespace=namespace)
-    assert equaloplists(loop1.operations, loop2.operations)
+    assert equaloplists(loop1.operations, loop2.operations,
+                        remap=make_remap(loop1.inputargs,
+                                         loop2.inputargs))
     py.test.raises(AssertionError,
-                   "equaloplists(loop1.operations, loop3.operations)")
+                   "equaloplists(loop1.operations, loop3.operations,"
+                   "remap=make_remap(loop1.inputargs, loop3.inputargs))")
 
 def test_equaloplists_fail_args():
     ops = """
@@ -65,13 +74,16 @@
     loop2 = pure_parse(ops.replace("[i2, i1]", "[i1, i2]"),
                        namespace=namespace)
     py.test.raises(AssertionError,
-                   "equaloplists(loop1.operations, loop2.operations)")
+                   "equaloplists(loop1.operations, loop2.operations,"
+                   "remap=make_remap(loop1.inputargs, loop2.inputargs))")
     assert equaloplists(loop1.operations, loop2.operations,
+                        remap=make_remap(loop1.inputargs, loop2.inputargs),
                         strict_fail_args=False)
     loop3 = pure_parse(ops.replace("[i2, i1]", "[i2, i0]"),
                        namespace=namespace)
     py.test.raises(AssertionError,
-                   "equaloplists(loop1.operations, loop3.operations)")
+                   "equaloplists(loop1.operations, loop3.operations,"
+                   " remap=make_remap(loop1.inputargs, loop3.inputargs))")
 
 # ____________________________________________________________