[pypy-svn] r74542 - in pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86: . test

[jcreigh at codespeak.net]

Author: jcreigh
Date: Tue May 18 16:44:38 2010
New Revision: 74542

Added:
   pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/rx86.py
      - copied unchanged from r74541, pypy/branch/remove-ri386-multimethod-2/pypy/jit/backend/x86/rx86.py
   pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86.py
      - copied unchanged from r74541, pypy/branch/remove-ri386-multimethod-2/pypy/jit/backend/x86/test/test_rx86.py
   pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86_32_auto_encoding.py
      - copied unchanged from r74541, pypy/branch/remove-ri386-multimethod-2/pypy/jit/backend/x86/test/test_rx86_32_auto_encoding.py
   pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86_64_auto_encoding.py
      - copied unchanged from r74541, pypy/branch/remove-ri386-multimethod-2/pypy/jit/backend/x86/test/test_rx86_64_auto_encoding.py
Modified:
   pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/conftest.py
Log:
import rx86.py from remove-ri386-multimethod-2 branch

Modified: pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/conftest.py
==============================================================================
--- pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/conftest.py	(original)
+++ pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/conftest.py	Tue May 18 16:44:38 2010
@@ -3,6 +3,9 @@
 
 cpu = detect_cpu.autodetect()
 def pytest_runtest_setup(item):
-    if cpu != 'x86':
-        py.test.skip("x86 directory skipped: cpu is %r" % (cpu,))
-    
+    # XXX
+    if "test_rx86" in str(item.fspath):
+        # Don't skip
+        pass
+    elif cpu != 'x86':
+        py.test.skip("x86 tests skipped: cpu is %r" % (cpu,))