[pypy-commit] pypy arm-backend-2: make sure arm backend tests are only executed when running on ARM

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r49389:f6952466347e
Date: 2011-11-14 10:44 +0100
http://bitbucket.org/pypy/pypy/changeset/f6952466347e/

Log:	make sure arm backend tests are only executed when running on ARM

diff --git a/pypy/jit/backend/arm/test/test_arch.py b/pypy/jit/backend/arm/test/test_arch.py
--- a/pypy/jit/backend/arm/test/test_arch.py
+++ b/pypy/jit/backend/arm/test/test_arch.py
@@ -1,4 +1,6 @@
 from pypy.jit.backend.arm import arch
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 def test_mod():
     assert arch.arm_int_mod(10, 2) == 0
diff --git a/pypy/jit/backend/arm/test/test_calling_convention.py b/pypy/jit/backend/arm/test/test_calling_convention.py
--- a/pypy/jit/backend/arm/test/test_calling_convention.py
+++ b/pypy/jit/backend/arm/test/test_calling_convention.py
@@ -3,6 +3,8 @@
 from pypy.jit.backend.test.calling_convention_test import TestCallingConv, parse
 from pypy.rpython.lltypesystem import lltype
 from pypy.jit.codewriter.effectinfo import EffectInfo
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 # ../../test/calling_convention_test.py
 class TestARMCallingConvention(TestCallingConv):
diff --git a/pypy/jit/backend/arm/test/test_gc_integration.py b/pypy/jit/backend/arm/test/test_gc_integration.py
--- a/pypy/jit/backend/arm/test/test_gc_integration.py
+++ b/pypy/jit/backend/arm/test/test_gc_integration.py
@@ -23,6 +23,8 @@
 from pypy.jit.backend.arm.regalloc import ARMv7RegisterMananger, ARMFrameManager,\
      VFPRegisterManager
 from pypy.jit.codewriter.effectinfo import EffectInfo
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 CPU = getcpuclass()
 
diff --git a/pypy/jit/backend/arm/test/test_generated.py b/pypy/jit/backend/arm/test/test_generated.py
--- a/pypy/jit/backend/arm/test/test_generated.py
+++ b/pypy/jit/backend/arm/test/test_generated.py
@@ -10,6 +10,8 @@
 from pypy.jit.metainterp.resoperation import ResOperation, rop
 from pypy.rpython.test.test_llinterp import interpret
 from pypy.jit.backend.detect_cpu import getcpuclass
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 CPU = getcpuclass()
 class TestStuff(object):
diff --git a/pypy/jit/backend/arm/test/test_helper.py b/pypy/jit/backend/arm/test/test_helper.py
--- a/pypy/jit/backend/arm/test/test_helper.py
+++ b/pypy/jit/backend/arm/test/test_helper.py
@@ -3,6 +3,8 @@
                                                     decode64, encode64
 from pypy.jit.metainterp.history import (BoxInt, BoxPtr, BoxFloat,
                                         INT, REF, FLOAT)
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 def test_count_reg_args():
     assert count_reg_args([BoxPtr()]) == 1
diff --git a/pypy/jit/backend/arm/test/test_instr_codebuilder.py b/pypy/jit/backend/arm/test/test_instr_codebuilder.py
--- a/pypy/jit/backend/arm/test/test_instr_codebuilder.py
+++ b/pypy/jit/backend/arm/test/test_instr_codebuilder.py
@@ -5,6 +5,8 @@
 from pypy.jit.backend.arm.test.support import (requires_arm_as, define_test, gen_test_function)
 from gen import assemble
 import py
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 requires_arm_as()
 
diff --git a/pypy/jit/backend/arm/test/test_jump.py b/pypy/jit/backend/arm/test/test_jump.py
--- a/pypy/jit/backend/arm/test/test_jump.py
+++ b/pypy/jit/backend/arm/test/test_jump.py
@@ -6,6 +6,8 @@
 from pypy.jit.backend.arm.regalloc import ARMFrameManager
 from pypy.jit.backend.arm.jump import remap_frame_layout, remap_frame_layout_mixed
 from pypy.jit.metainterp.history import INT
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 frame_pos = ARMFrameManager.frame_pos
 
diff --git a/pypy/jit/backend/arm/test/test_list.py b/pypy/jit/backend/arm/test/test_list.py
--- a/pypy/jit/backend/arm/test/test_list.py
+++ b/pypy/jit/backend/arm/test/test_list.py
@@ -1,6 +1,8 @@
 
 from pypy.jit.metainterp.test.test_list import ListTests
 from pypy.jit.backend.arm.test.support import JitARMMixin
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 class TestList(JitARMMixin, ListTests):
     # for individual tests see
diff --git a/pypy/jit/backend/arm/test/test_loop_unroll.py b/pypy/jit/backend/arm/test/test_loop_unroll.py
--- a/pypy/jit/backend/arm/test/test_loop_unroll.py
+++ b/pypy/jit/backend/arm/test/test_loop_unroll.py
@@ -1,6 +1,8 @@
 import py
 from pypy.jit.backend.x86.test.test_basic import Jit386Mixin
 from pypy.jit.metainterp.test import test_loop_unroll
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 class TestLoopSpec(Jit386Mixin, test_loop_unroll.LoopUnrollTest):
     # for the individual tests see
diff --git a/pypy/jit/backend/arm/test/test_recompilation.py b/pypy/jit/backend/arm/test/test_recompilation.py
--- a/pypy/jit/backend/arm/test/test_recompilation.py
+++ b/pypy/jit/backend/arm/test/test_recompilation.py
@@ -1,4 +1,6 @@
 from pypy.jit.backend.arm.test.test_regalloc import BaseTestRegalloc
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 class TestRecompilation(BaseTestRegalloc):
     def test_compile_bridge_not_deeper(self):
diff --git a/pypy/jit/backend/arm/test/test_recursive.py b/pypy/jit/backend/arm/test/test_recursive.py
--- a/pypy/jit/backend/arm/test/test_recursive.py
+++ b/pypy/jit/backend/arm/test/test_recursive.py
@@ -1,6 +1,8 @@
 
 from pypy.jit.metainterp.test.test_recursive import RecursiveTests
 from pypy.jit.backend.arm.test.support import JitARMMixin
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 class TestRecursive(JitARMMixin, RecursiveTests):
     # for the individual tests see
diff --git a/pypy/jit/backend/arm/test/test_regalloc.py b/pypy/jit/backend/arm/test/test_regalloc.py
--- a/pypy/jit/backend/arm/test/test_regalloc.py
+++ b/pypy/jit/backend/arm/test/test_regalloc.py
@@ -14,6 +14,8 @@
 from pypy.rpython.annlowlevel import llhelper
 from pypy.rpython.lltypesystem import rclass, rstr
 from pypy.jit.codewriter.effectinfo import EffectInfo
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 
 CPU = getcpuclass()
diff --git a/pypy/jit/backend/arm/test/test_regalloc2.py b/pypy/jit/backend/arm/test/test_regalloc2.py
--- a/pypy/jit/backend/arm/test/test_regalloc2.py
+++ b/pypy/jit/backend/arm/test/test_regalloc2.py
@@ -4,6 +4,8 @@
 from pypy.jit.metainterp.resoperation import rop
 from pypy.jit.backend.detect_cpu import getcpuclass
 from pypy.jit.backend.arm.arch import WORD
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 CPU = getcpuclass()
 
 def test_bug_rshift():
diff --git a/pypy/jit/backend/arm/test/test_regalloc_mov.py b/pypy/jit/backend/arm/test/test_regalloc_mov.py
--- a/pypy/jit/backend/arm/test/test_regalloc_mov.py
+++ b/pypy/jit/backend/arm/test/test_regalloc_mov.py
@@ -7,6 +7,9 @@
 from pypy.jit.backend.arm.conditions import AL
 from pypy.jit.metainterp.history import INT, FLOAT, REF
 import py
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
+
 class MockInstr(object):
     def __init__(self, name, *args, **kwargs):
         self.name = name
diff --git a/pypy/jit/backend/arm/test/test_string.py b/pypy/jit/backend/arm/test/test_string.py
--- a/pypy/jit/backend/arm/test/test_string.py
+++ b/pypy/jit/backend/arm/test/test_string.py
@@ -1,6 +1,8 @@
 import py
 from pypy.jit.metainterp.test import test_string
 from pypy.jit.backend.arm.test.support import JitARMMixin
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 class TestString(JitARMMixin, test_string.TestLLtype):
     # for the individual tests see
diff --git a/pypy/jit/backend/arm/test/test_trace_operations.py b/pypy/jit/backend/arm/test/test_trace_operations.py
--- a/pypy/jit/backend/arm/test/test_trace_operations.py
+++ b/pypy/jit/backend/arm/test/test_trace_operations.py
@@ -1,3 +1,6 @@
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
+
 from pypy.jit.backend.x86.test.test_regalloc import BaseTestRegalloc
 from pypy.jit.backend.detect_cpu import getcpuclass
 from pypy.rpython.lltypesystem import lltype, llmemory
diff --git a/pypy/jit/backend/arm/test/test_zll_random.py b/pypy/jit/backend/arm/test/test_zll_random.py
--- a/pypy/jit/backend/arm/test/test_zll_random.py
+++ b/pypy/jit/backend/arm/test/test_zll_random.py
@@ -4,6 +4,8 @@
 from pypy.jit.backend.test.test_ll_random import LLtypeOperationBuilder
 from pypy.jit.backend.test.test_random import check_random_function, Random
 from pypy.jit.metainterp.resoperation import rop
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 CPU = getcpuclass()
 
diff --git a/pypy/jit/backend/arm/test/test_zrpy_gc.py b/pypy/jit/backend/arm/test/test_zrpy_gc.py
--- a/pypy/jit/backend/arm/test/test_zrpy_gc.py
+++ b/pypy/jit/backend/arm/test/test_zrpy_gc.py
@@ -14,6 +14,8 @@
 from pypy.jit.backend.llsupport.gc import GcLLDescr_framework
 from pypy.tool.udir import udir
 from pypy.config.translationoption import DEFL_GC
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 class X(object):
     def __init__(self, x=0):
diff --git a/pypy/jit/backend/arm/test/test_ztranslate_backend.py b/pypy/jit/backend/arm/test/test_ztranslate_backend.py
--- a/pypy/jit/backend/arm/test/test_ztranslate_backend.py
+++ b/pypy/jit/backend/arm/test/test_ztranslate_backend.py
@@ -13,6 +13,8 @@
 from pypy.jit.backend.detect_cpu import getcpuclass
 from pypy.jit.backend.arm.runner import ArmCPU
 from pypy.tool.udir import udir
+from pypy.jit.backend.arm.test.support import skip_unless_arm
+skip_unless_arm()
 
 class FakeStats(object):
     pass