[pypy-commit] pypy default: Skip vmprof tests on CPUs different than x86-64

arigo noreply at buildbot.pypy.org
Mon May 4 10:48:05 CEST 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r77030:f58d7d46491c
Date: 2015-05-04 10:48 +0200
http://bitbucket.org/pypy/pypy/changeset/f58d7d46491c/

Log:	Skip vmprof tests on CPUs different than x86-64

diff --git a/rpython/jit/backend/x86/test/conftest.py b/pypy/module/_vmprof/test/conftest.py
copy from rpython/jit/backend/x86/test/conftest.py
copy to pypy/module/_vmprof/test/conftest.py
--- a/rpython/jit/backend/x86/test/conftest.py
+++ b/pypy/module/_vmprof/test/conftest.py
@@ -1,12 +1,7 @@
-import py, os
+import py
 from rpython.jit.backend import detect_cpu
 
 cpu = detect_cpu.autodetect()
 def pytest_runtest_setup(item):
-    if not cpu.startswith('x86'):
-        py.test.skip("x86/x86_64 tests skipped: cpu is %r" % (cpu,))
-    if cpu == 'x86_64':
-        if os.name == "nt":
-            py.test.skip("Windows cannot allocate non-reserved memory")
-        from rpython.rtyper.lltypesystem import ll2ctypes
-        ll2ctypes.do_allocation_in_far_regions()
+    if cpu != detect_cpu.MODEL_X86_64:
+        py.test.skip("x86_64 tests only")


More information about the pypy-commit mailing list