[pypy-svn] r31827 - pypy/dist/pypy/jit/codegen/i386/test

[pedronis at codespeak.net]

Author: pedronis
Date: Wed Aug 30 13:06:58 2006
New Revision: 31827

Modified:
   pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py
   pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py
Log:
convert i386 timeshifting tests adapation to mixins.



Modified: pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py	Wed Aug 30 13:06:58 2006
@@ -7,10 +7,8 @@
 from pypy.rpython.unroll import unrolling_iterable
 from pypy.jit.codegen.i386.ri386genop import RI386GenOp
 
-#import py; py.test.skip("in-progress")
 
-
-class TestTimeshiftI386(test_timeshift.TestTimeshift):
+class I386TimeshiftingTestMixin(object):
     RGenOp = RI386GenOp
 
     SEPLINE = 'running residual graph...\n'
@@ -121,5 +119,10 @@
     def check_insns(self, expected=None, **counts):
         "Cannot check instructions in the generated assembler."
 
+class TestTimeshiftI386(I386TimeshiftingTestMixin,
+                        test_timeshift.TestTimeshift):
+
     # for the individual tests see
     # ====> ../../../timeshifter/test/test_timeshift.py
+
+    pass

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py	Wed Aug 30 13:06:58 2006
@@ -3,14 +3,12 @@
 from pypy.jit.timeshifter.test import test_timeshift
 from pypy.jit.codegen.i386.ri386genop import RI386GenOp, IntConst
 
-#import py; py.test.skip("in-progress")
-
 
 class Whatever(object):
     def __eq__(self, other):
         return True
 
-class TestTimeshiftI386LLInterp(test_timeshift.TestTimeshift):
+class I386LLInterpTimeshiftingTestMixin(object):
     class RGenOp(RI386GenOp):
         from pypy.jit.codegen.i386.codebuf import LLTypeMachineCodeBlock as MachineCodeBlock
 
@@ -60,5 +58,11 @@
         pass
 
 
+class TestTimeshiftI386LLInterp(I386LLInterpTimeshiftingTestMixin,
+                                test_timeshift.TestTimeshift):
+    
     # for the individual tests see
     # ====> ../../../timeshifter/test/test_timeshift.py
+
+    pass
+