[pypy-svn] r64584 - pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test

[antocuni at codespeak.net]

Author: antocuni
Date: Thu Apr 23 10:45:48 2009
New Revision: 64584

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_dummy.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_spec.py
Log:
rename TestLoop in TestLLtype, and port test_dummy to ootype


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop.py	Thu Apr 23 10:45:48 2009
@@ -544,5 +544,5 @@
 class TestOOtype(LoopTest, OOJitMixin):
     pass
 
-class TestLoop(LoopTest, LLJitMixin): # XXX change name later
+class TestLLtype(LoopTest, LLJitMixin):
     pass

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_dummy.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_dummy.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_dummy.py	Thu Apr 23 10:45:48 2009
@@ -2,8 +2,18 @@
 from pypy.jit.metainterp.test import test_loop
 from pypy.jit.metainterp.warmspot import ll_meta_interp
 from pypy.jit.metainterp.simple_optimize import Optimizer
+from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
 
-class TestLoopDummy(test_loop.TestLoop):
+class LoopDummyTest(test_loop.LoopTest):
     def meta_interp(self, func, args, **kwds):
         return ll_meta_interp(func, args, optimizer=Optimizer,
-                              CPUClass=self.CPUClass, **kwds)
+                              CPUClass=self.CPUClass, 
+                              type_system=self.type_system,
+                              **kwds)
+
+
+class TestLLtype(LoopDummyTest, LLJitMixin):
+    pass
+
+class TestOOtype(LoopDummyTest, OOJitMixin):
+    pass

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_spec.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_spec.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_loop_spec.py	Thu Apr 23 10:45:48 2009
@@ -1,8 +1,14 @@
 import py
 from pypy.jit.metainterp.test import test_loop
+from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
 
-
-class TestLoopSpec(test_loop.TestLoop):
+class LoopSpecTest(test_loop.LoopTest):
     specialize = True
 
     # ====> test_loop.py
+
+class TestLLtype(LoopSpecTest, LLJitMixin):
+    pass
+
+## class TestOOtype(LoopSpecTest, OOJitMixin):
+##     pass