[pypy-svn] r66584 - pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test

arigo at codespeak.net arigo at codespeak.net
Fri Jul 24 15:06:48 CEST 2009


Author: arigo
Date: Fri Jul 24 15:06:47 2009
New Revision: 66584

Modified:
   pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_virtualizable.py
   pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_zrpy_basic.py
Log:
Fix imports in the tests.


Modified: pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_virtualizable.py
==============================================================================
--- pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_virtualizable.py	(original)
+++ pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_virtualizable.py	Fri Jul 24 15:06:47 2009
@@ -9,7 +9,7 @@
 from pypy.rpython.lltypesystem.rvirtualizable2 import VirtualizableAccessor
 from pypy.jit.metainterp.warmspot import get_stats
 from pypy.jit.metainterp import history, heaptracker
-from pypy.jit.metainterp.test.test_optimize import NODE
+from pypy.jit.metainterp.test.test_optimizefindnode import LLtypeMixin
 
 promote_virtualizable = lloperation.llop.promote_virtualizable
 debug_print = lloperation.llop.debug_print
@@ -24,7 +24,7 @@
         ('vable_base', llmemory.Address),
         ('vable_rti', VABLERTIPTR),
         ('inst_x', lltype.Signed),
-        ('inst_node', lltype.Ptr(NODE)),
+        ('inst_node', lltype.Ptr(LLtypeMixin.NODE)),
         hints = {'virtualizable2_accessor': VirtualizableAccessor()})
     XY._hints['virtualizable2_accessor'].initialize(
         XY, ['inst_x', 'inst_node'])

Modified: pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_zrpy_basic.py
==============================================================================
--- pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_zrpy_basic.py	(original)
+++ pypy/branch/pyjitpl5-optimize4/pypy/jit/metainterp/test/test_zrpy_basic.py	Fri Jul 24 15:06:47 2009
@@ -46,10 +46,10 @@
         res = ll_meta_interp(f, [17], CPUClass=self.CPUClass,
                              type_system=self.type_system)
         assert res == (17+14+11+8+7+6+5+4) * 10
-        from pypy.jit.metainterp import optimize4
+        from pypy.jit.metainterp import optimize
         res = rpython_ll_meta_interp(f, [17], loops=2, CPUClass=self.CPUClass,
                                      type_system=self.type_system,
-                                     optimizer=optimize4)
+                                     optimizer=optimize)
         assert res == (17+14+11+8+7+6+5+4) * 10
 
 



More information about the Pypy-commit mailing list