[pypy-svn] r61719 - pypy/branch/pyjitpl5/pypy/jit/metainterp/test

fijal at codespeak.net fijal at codespeak.net
Wed Feb 11 12:59:47 CET 2009


Author: fijal
Date: Wed Feb 11 12:59:46 2009
New Revision: 61719

Removed:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_vbool.py
Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_exception.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop_spec.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimize.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_send.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_slist.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_support.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_tl.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtual.py
Log:
(arigo, fijal)
Fix imports and remove test_vbool


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_exception.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_exception.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_exception.py	Wed Feb 11 12:59:46 2009
@@ -1,7 +1,7 @@
 import py
-from test.test_basic import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
 from pypy.rlib.jit import JitDriver, hint
-from policy import StopAtXPolicy
+from pypy.jit.metainterp.policy import StopAtXPolicy
 
 
 class ExceptionTests:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py	Wed Feb 11 12:59:46 2009
@@ -1,9 +1,9 @@
 import py
 from pypy.rlib.jit import JitDriver
-from warmspot import ll_meta_interp, get_stats
+from pypy.jit.metainterp.warmspot import ll_meta_interp, get_stats
 from pypy.rpython.lltypesystem import lltype
-from test.test_basic import LLJitMixin
-from policy import StopAtXPolicy
+from pypy.jit.metainterp.test.test_basic import LLJitMixin
+from pypy.jit.metainterp.policy import StopAtXPolicy
 
 class TestLoop(LLJitMixin):
     specialize = False

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop_spec.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop_spec.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop_spec.py	Wed Feb 11 12:59:46 2009
@@ -1,5 +1,5 @@
 import py
-import test_loop
+from pypy.jit.metainterp.test import test_loop
 
 
 class TestLoopSpec(test_loop.TestLoop):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimize.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimize.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimize.py	Wed Feb 11 12:59:46 2009
@@ -4,13 +4,13 @@
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.lltypesystem.rclass import OBJECT, OBJECT_VTABLE
 
-from llgraph import runner
-from history import BoxInt, BoxPtr, ConstInt, ConstPtr, ConstAddr
-from history import ResOperation, MergePoint, Jump, GuardOp
-from optimize import PerfectSpecializer, CancelInefficientLoop
-from optimize import VirtualInstanceSpecNode, FixedClassSpecNode
-from optimize import rebuild_boxes_from_guard_failure, type_cache
-from optimize import AllocationStorage
+from pypy.jit.backend.llgraph import runner
+from pypy.jit.metainterp.history import (BoxInt, BoxPtr, ConstInt, ConstPtr,
+                                         ConstAddr, ResOperation, MergePoint,
+                                         Jump, GuardOp)
+from pypy.jit.metainterp.optimize import (PerfectSpecializer,
+    CancelInefficientLoop, VirtualInstanceSpecNode, FixedClassSpecNode,
+    rebuild_boxes_from_guard_failure, type_cache, AllocationStorage)
 
 cpu = runner.CPU(None)
 

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_send.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_send.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_send.py	Wed Feb 11 12:59:46 2009
@@ -1,8 +1,8 @@
 import py
 from pypy.rlib.jit import JitDriver
-from policy import StopAtXPolicy
+from pypy.jit.metainterp.policy import StopAtXPolicy
 from pypy.rpython.ootypesystem import ootype
-from test.test_basic import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
 
 
 class SendTests:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_slist.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_slist.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_slist.py	Wed Feb 11 12:59:46 2009
@@ -1,6 +1,6 @@
 import py
-from policy import StopAtXPolicy
-from test.test_basic import LLJitMixin, OOJitMixin
+from pypy.jit.metainterp.policy import StopAtXPolicy
+from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
 from pypy.rlib.jit import JitDriver, hint
 
 class ListTests:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_support.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_support.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_support.py	Wed Feb 11 12:59:46 2009
@@ -1,7 +1,7 @@
 import py
 from pypy.rpython.lltypesystem import lltype
 from pypy.objspace.flow.model import Variable, Constant, SpaceOperation
-from support import decode_builtin_call
+from pypy.jit.metainterp.support import decode_builtin_call
 
 def newconst(x):
     return Constant(x, lltype.typeOf(x))

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_tl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_tl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_tl.py	Wed Feb 11 12:59:46 2009
@@ -1,7 +1,7 @@
 import py
 from pypy.rlib.jit import JitDriver, hint
-from policy import StopAtXPolicy
-from test.test_basic import OOJitMixin, LLJitMixin
+from pypy.jit.metainterp.policy import StopAtXPolicy
+from pypy.jit.metainterp.test.test_basic import OOJitMixin, LLJitMixin
 
 
 class ToyLanguageTests:

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtual.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtual.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtual.py	Wed Feb 11 12:59:46 2009
@@ -1,4 +1,5 @@
 import py
+py.test.skip("look later")
 from pypy.rlib.jit import JitDriver, hint
 from pypy.jit.hintannotator.policy import StopAtXPolicy
 from pyjitpl import oo_meta_interp, get_stats



More information about the Pypy-commit mailing list