[pypy-commit] pypy default: fix tests for changeset 5ed628789a2c

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r68292:287eb01c11f4
Date: 2013-11-23 20:05 +0200
http://bitbucket.org/pypy/pypy/changeset/287eb01c11f4/

Log:	fix tests for changeset 5ed628789a2c

diff --git a/rpython/jit/backend/x86/test/test_ztranslation_basic.py b/rpython/jit/backend/x86/test/test_ztranslation_basic.py
--- a/rpython/jit/backend/x86/test/test_ztranslation_basic.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation_basic.py
@@ -1,11 +1,11 @@
 from rpython.jit.backend.llsupport.test.ztranslation_test import TranslationTest
 from rpython.jit.backend.x86.arch import WORD
+import sys
 
 
 class TestTranslationX86(TranslationTest):
     def _check_cbuilder(self, cbuilder):
-        # We assume here that we have sse2.  If not, the CPUClass
-        # needs to be changed to CPU386_NO_SSE2, but well.
-        if WORD == 4:
+        # msse2 and sse are always on on x86-64
+        if WORD == 4 and sys.platform != 'win32':
             assert '-msse2' in cbuilder.eci.compile_extra
             assert '-mfpmath=sse' in cbuilder.eci.compile_extra
diff --git a/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py b/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
--- a/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
@@ -1,11 +1,13 @@
 from rpython.jit.backend.llsupport.test.ztranslation_test import TranslationTestCallAssembler
 from rpython.translator.translator import TranslationContext
 from rpython.config.translationoption import DEFL_GC
-
+from rpython.jit.backend.x86.arch import WORD
+import sys
 
 class TestTranslationCallAssemblerX86(TranslationTestCallAssembler):
     def _check_cbuilder(self, cbuilder):
-        # We assume here that we have sse2.  If not, the CPUClass
+        #We assume here that we have sse2.  If not, the CPUClass
         # needs to be changed to CPU386_NO_SSE2, but well.
-        assert '-msse2' in cbuilder.eci.compile_extra
-        assert '-mfpmath=sse' in cbuilder.eci.compile_extra
\ No newline at end of file
+        if WORD == 4 and sys.platform != 'win32':
+            assert '-msse2' in cbuilder.eci.compile_extra
+            assert '-mfpmath=sse' in cbuilder.eci.compile_extra
diff --git a/rpython/jit/backend/x86/test/test_ztranslation_jit_stats.py b/rpython/jit/backend/x86/test/test_ztranslation_jit_stats.py
--- a/rpython/jit/backend/x86/test/test_ztranslation_jit_stats.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation_jit_stats.py
@@ -1,11 +1,14 @@
 from rpython.jit.backend.llsupport.test.ztranslation_test import TranslationTestJITStats
 from rpython.translator.translator import TranslationContext
 from rpython.config.translationoption import DEFL_GC
+from rpython.jit.backend.x86.arch import WORD
+import sys
 
 
 class TestTranslationJITStatsX86(TranslationTestJITStats):
     def _check_cbuilder(self, cbuilder):
-        # We assume here that we have sse2.  If not, the CPUClass
+        #We assume here that we have sse2.  If not, the CPUClass
         # needs to be changed to CPU386_NO_SSE2, but well.
-        assert '-msse2' in cbuilder.eci.compile_extra
-        assert '-mfpmath=sse' in cbuilder.eci.compile_extra
\ No newline at end of file
+        if WORD == 4 and sys.platform != 'win32':
+            assert '-msse2' in cbuilder.eci.compile_extra
+            assert '-mfpmath=sse' in cbuilder.eci.compile_extra