[pypy-svn] r72706 - in pypy/branch/fix-64/pypy: jit/backend/x86/test translator/c/gcc/test

[arigo at codespeak.net]

Author: arigo
Date: Wed Mar 24 14:17:25 2010
New Revision: 72706

Added:
   pypy/branch/fix-64/pypy/translator/c/gcc/test/conftest.py
      - copied, changed from r72695, pypy/branch/fix-64/pypy/jit/backend/x86/test/conftest.py
Modified:
   pypy/branch/fix-64/pypy/jit/backend/x86/test/conftest.py
Log:
Tweak the conftest.  By skipping at the level of each module instead of
at the level of the directory, we avoid crashes when we try to say
"py.test test_somefile.py".



Modified: pypy/branch/fix-64/pypy/jit/backend/x86/test/conftest.py
==============================================================================
--- pypy/branch/fix-64/pypy/jit/backend/x86/test/conftest.py	(original)
+++ pypy/branch/fix-64/pypy/jit/backend/x86/test/conftest.py	Wed Mar 24 14:17:25 2010
@@ -1,9 +1,9 @@
 import py
 from pypy.jit.backend import detect_cpu
 
-class Directory(py.test.collect.Directory):
+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(Directory, self).collect()
+        return super(Module, self).collect()

Copied: pypy/branch/fix-64/pypy/translator/c/gcc/test/conftest.py (from r72695, pypy/branch/fix-64/pypy/jit/backend/x86/test/conftest.py)
==============================================================================
--- pypy/branch/fix-64/pypy/jit/backend/x86/test/conftest.py	(original)
+++ pypy/branch/fix-64/pypy/translator/c/gcc/test/conftest.py	Wed Mar 24 14:17:25 2010
@@ -1,9 +1,9 @@
 import py
 from pypy.jit.backend import detect_cpu
 
-class Directory(py.test.collect.Directory):
+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(Directory, self).collect()
+        return super(Module, self).collect()