[pypy-commit] pypy jit-short_from_state: fix test

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-short_from_state
Changeset: r46250:b9c1fec7c7d6
Date: 2011-08-02 18:47 +0200
http://bitbucket.org/pypy/pypy/changeset/b9c1fec7c7d6/

Log:	fix test

diff --git a/pypy/jit/metainterp/test/test_virtualstate.py b/pypy/jit/metainterp/test/test_virtualstate.py
--- a/pypy/jit/metainterp/test/test_virtualstate.py
+++ b/pypy/jit/metainterp/test/test_virtualstate.py
@@ -1,5 +1,5 @@
 import py
-from pypy.jit.metainterp.optimizeutil import InvalidLoop
+from pypy.jit.metainterp.optimize import InvalidLoop
 from pypy.jit.metainterp.optimizeopt.virtualstate import VirtualStateInfo, VStructStateInfo, \
      VArrayStateInfo, NotVirtualStateInfo
 from pypy.jit.metainterp.optimizeopt.optimizer import OptValue
@@ -134,6 +134,9 @@
         guards = []
         info1.generate_guards(info2, box, self.cpu, guards, {})
         loop = self.parse(expected)
+        for op in loop.operations:
+            if op.is_guard():
+                op.setdescr(None)
         assert equaloplists(guards, loop.operations, False,
                             {loop.inputargs[0]: box})        
     def test_intbounds(self):
@@ -181,6 +184,9 @@
         guard_class(p0, ConstClass(node_vtable)) []
         """
         loop = self.parse(expected)
+        for op in loop.operations:
+            if op.is_guard():
+                op.setdescr(None)
         assert equaloplists(guards, loop.operations, False,
                             {loop.inputargs[0]: box})