Commits

holger krekel committed 7dcd918

fix 64-bit skipping - The old conftest.py Module or Directory classes
will not be detected anymore now that the new hooks are in use.

  • Participants
  • Parent commits ec82d75

Comments (0)

Files changed (3)

pypy/jit/backend/x86/test/conftest.py

 import py
 from pypy.jit.backend import detect_cpu
 
-class Module(py.test.collect.Module):
-    def collect(self):
-        cpu = detect_cpu.autodetect()
-        if cpu != 'x86':
-            py.test.skip("x86 directory skipped: cpu is %r" % (cpu,))
-        return super(Module, self).collect()
+cpu = detect_cpu.autodetect()
+def pytest_runtest_setup(item):
+    if cpu != 'x86':
+        py.test.skip("x86 directory skipped: cpu is %r" % (cpu,))
+    

pypy/translator/c/gcc/test/conftest.py

 import py
 from pypy.jit.backend import detect_cpu
 
-class Module(py.test.collect.Module):
-    def collect(self):
-        cpu = detect_cpu.autodetect()
-        if cpu != 'x86':
-            py.test.skip("x86 directory skipped: cpu is %r" % (cpu,))
-        return super(Module, self).collect()
+cpu = detect_cpu.autodetect()
+def pytest_runtest_setup(item):
+    if cpu != 'x86':
+        py.test.skip("x86 directory skipped: cpu is %r" % (cpu,))
+    

pypy/translator/jvm/conftest.py

 
 import py, sys
 
-class Module(py.test.collect.Module):
-    def collect(self):
-        if sys.maxint > 2147483647: # 64bit platform
-            py.test.skip("jvm backend on 64bit unsupported")
-        return super(Module, self).collect()
+def pytest_runtest_setup(item):
+    if sys.maxint > 2147483647: # 64bit platform
+        py.test.skip("jvm backend on 64bit unsupported")
 
 def pytest_addoption(parser):
     group = parser.getgroup("pypy-jvm options")