Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r85890:3361a42be4a0
Date: 2016-07-28 10:21 +0200
http://bitbucket.org/pypy/pypy/changeset/3361a42be4a0/
Log: merge heads
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
@@ -4,6 +4,16 @@
from rpython.jit.backend.x86.arch import WORD
import sys
+
+# On Windows, this test crashes obscurely, but only if compiled with
+# Boehm, not if run with no GC at all. So for now we'll assume it is
+# really a Boehm bug, or maybe a Boehm-on-Windows-specific issue, and
+# skip.
+if sys.platform == 'win32':
+ import py
+ py.test.skip("crashes on Windows (Boehm issue?)")
+
+
class TestTranslationCallAssemblerX86(TranslationTestCallAssembler):
def _check_cbuilder(self, cbuilder):
#We assume here that we have sse2. If not, the CPUClass
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
