[pypy-svn] r74480 - in pypy/trunk/pypy: jit/backend/x86/test translator/c/gcc/test translator/jvm

hpk at codespeak.net hpk at codespeak.net
Tue May 11 11:48:34 CEST 2010


Author: hpk
Date: Tue May 11 11:48:33 2010
New Revision: 74480

Added:
   pypy/trunk/pypy/translator/c/gcc/test/conftest.py
      - copied, changed from r74476, pypy/trunk/pypy/jit/backend/x86/test/conftest.py
Modified:
   pypy/trunk/pypy/jit/backend/x86/test/conftest.py
   pypy/trunk/pypy/translator/jvm/conftest.py
Log:
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. 


Modified: pypy/trunk/pypy/jit/backend/x86/test/conftest.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/x86/test/conftest.py	(original)
+++ pypy/trunk/pypy/jit/backend/x86/test/conftest.py	Tue May 11 11:48:33 2010
@@ -1,9 +1,8 @@
 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,))
+    

Copied: pypy/trunk/pypy/translator/c/gcc/test/conftest.py (from r74476, pypy/trunk/pypy/jit/backend/x86/test/conftest.py)
==============================================================================
--- pypy/trunk/pypy/jit/backend/x86/test/conftest.py	(original)
+++ pypy/trunk/pypy/translator/c/gcc/test/conftest.py	Tue May 11 11:48:33 2010
@@ -1,9 +1,8 @@
 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,))
+    

Modified: pypy/trunk/pypy/translator/jvm/conftest.py
==============================================================================
--- pypy/trunk/pypy/translator/jvm/conftest.py	(original)
+++ pypy/trunk/pypy/translator/jvm/conftest.py	Tue May 11 11:48:33 2010
@@ -1,11 +1,9 @@
 
 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")



More information about the Pypy-commit mailing list