[pypy-svn] r74828 - pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test

[jcreigh at codespeak.net]

Author: jcreigh
Date: Thu May 27 23:38:25 2010
New Revision: 74828

Modified:
   pypy/branch/x86-64-jit-backend/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
Log:
fix some test failures

Modified: pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86.py
==============================================================================
--- pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86.py	(original)
+++ pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86.py	Thu May 27 23:38:25 2010
@@ -69,11 +69,11 @@
 
 def test_mov_ra_no_base():
     s = CodeBuilder32()
-    s.MOV_ra(edx, (None, edi, 2, 0))
+    s.MOV_ra(edx, (NO_BASE_REGISTER, edi, 2, 0))
     assert s.getvalue() == '\x8B\x14\xBD\x00\x00\x00\x00'
 
     s = CodeBuilder32()
-    s.MOV_ra(edx, (None, edi, 2, 0xCD))
+    s.MOV_ra(edx, (NO_BASE_REGISTER, edi, 2, 0xCD))
     assert s.getvalue() == '\x8B\x14\xBD\xCD\x00\x00\x00'
 
 def test_mov_ar():

Modified: pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86_32_auto_encoding.py
==============================================================================
--- pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86_32_auto_encoding.py	(original)
+++ pypy/branch/x86-64-jit-backend/pypy/jit/backend/x86/test/test_rx86_32_auto_encoding.py	Thu May 27 23:38:25 2010
@@ -238,6 +238,8 @@
             if methname == 'FSTP_b':
                 # Doesn't work on 64-bit, skipping for now
                 py.test.skip('Skipping FSTP')
+            if methname == 'CALL_j':
+                py.test.skip("CALL_j is actually relative")
 
             return [args]