[pypy-svn] r77647 - pypy/branch/arm-backend/pypy/jit/backend/arm/test

[david at codespeak.net]

Author: david
Date: Wed Oct  6 15:07:58 2010
New Revision: 77647

Modified:
   pypy/branch/arm-backend/pypy/jit/backend/arm/test/support.py
   pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py
   pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py
Log:
move platform based skipping to the module level


Modified: pypy/branch/arm-backend/pypy/jit/backend/arm/test/support.py
==============================================================================
--- pypy/branch/arm-backend/pypy/jit/backend/arm/test/support.py	(original)
+++ pypy/branch/arm-backend/pypy/jit/backend/arm/test/support.py	Wed Oct  6 15:07:58 2010
@@ -7,15 +7,15 @@
     func = rffi.cast(lltype.Ptr(BOOTSTRAP_TP), addr)
     return func()
 
-def skip_unless_arm(f):
+def skip_unless_arm():
     import os
-    def skip_it(*args):
-        import py
-        py.test.skip('only for arm')
+    import py
 
-    func = skip_it
+    skip = True
     try:
         if os.uname()[4].index('arm') >= 0:
-            func=f
+            skip = False
     finally:
-        return func
+        if skip:
+            py.test.skip('only for arm')
+

Modified: pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py
==============================================================================
--- pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py	(original)
+++ pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_assembler.py	Wed Oct  6 15:07:58 2010
@@ -2,25 +2,24 @@
 from pypy.jit.backend.arm.assembler import AssemblerARM
 from pypy.jit.backend.arm.test.support import skip_unless_arm, run_asm
 
+skip_unless_arm()
+
 class TestRunningAssembler():
     def setup_method(self, method):
         self.a = AssemblerARM(None)
 
-    @skip_unless_arm
     def test_load_small_int_to_reg(self):
         self.a.gen_preamble()
         self.a.gen_load_int(r.r0, 123)
         self.a.gen_out()
         assert run_asm(self.a) == 123
 
-    @skip_unless_arm
     def test_load_medium_int_to_reg(self):
         self.a.gen_preamble()
         self.a.gen_load_int(r.r0, 0xBBD7)
         self.a.gen_out()
         assert run_asm(self.a) == 48087
 
-    @skip_unless_arm
     def test_load_int_to_reg(self):
         self.a.gen_preamble()
         self.a.gen_load_int(r.r0, 0xFFFFFF85)
@@ -28,7 +27,6 @@
         assert run_asm(self.a) == -123
 
 
-    @skip_unless_arm
     def test_or(self):
         self.a.gen_preamble()
         self.a.mc.MOV_ri(r.r1, 8)

Modified: pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py
==============================================================================
--- pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py	(original)
+++ pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py	Wed Oct  6 15:07:58 2010
@@ -1,5 +1,8 @@
 from pypy.jit.backend.arm.runner import ArmCPU
 from pypy.jit.backend.test.runner_test import LLtypeBackendTest
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+
+skip_unless_arm()
 
 class FakeStats(object):
     pass