Author: Matti Picus <matti.pi...@gmail.com>
Branch:
Changeset: r92423:00da64c1290f
Date: 2017-09-19 22:52 +0300
http://bitbucket.org/pypy/pypy/changeset/00da64c1290f/
Log: try harder to skip _vmprof tests on win32
diff --git a/pypy/module/_vmprof/__init__.py b/pypy/module/_vmprof/__init__.py
--- a/pypy/module/_vmprof/__init__.py
+++ b/pypy/module/_vmprof/__init__.py
@@ -1,5 +1,7 @@
from pypy.interpreter.mixedmodule import MixedModule
from rpython.rlib.rvmprof import VMProfPlatformUnsupported
+from rpython.translator.platform import CompilationError
+
class Module(MixedModule):
"""
@@ -29,3 +31,9 @@
import pypy.module._vmprof.interp_vmprof
except VMProfPlatformUnsupported as e:
pass
+except CompilationError as e:
+ import sys
+ if sys.platform == 'win32':
+ pass
+ else:
+ raise
diff --git a/pypy/module/_vmprof/conftest.py b/pypy/module/_vmprof/conftest.py
--- a/pypy/module/_vmprof/conftest.py
+++ b/pypy/module/_vmprof/conftest.py
@@ -1,6 +1,8 @@
-import py, platform
+import py, platform, sys
def pytest_collect_directory(path, parent):
if platform.machine() == 's390x':
- py.test.skip("zarch tests skipped")
+ py.test.skip("_vmprof tests skipped")
+ if sys.platform == 'win32':
+ py.test.skip("_vmprof tests skipped")
pytest_collect_file = pytest_collect_directory
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
