[pypy-svn] r50760 - in pypy/dist/pypy: . lib/ctypes/test
arigo at codespeak.net
arigo at codespeak.net
Fri Jan 18 19:52:09 CET 2008
Author: arigo
Date: Fri Jan 18 19:52:08 2008
New Revision: 50760
Removed:
pypy/dist/pypy/lib/ctypes/test/conftest.py
Modified:
pypy/dist/pypy/conftest.py
Log:
(fijal, arigo)
Move the hack to skip lib/ctypes from py.test out of lib/ctypes
itself, because if you have a non-matching ctypes version installed
with CPython, the lib/ctypes/__init__.py will explode at import
time. :-(
Modified: pypy/dist/pypy/conftest.py
==============================================================================
--- pypy/dist/pypy/conftest.py (original)
+++ pypy/dist/pypy/conftest.py Fri Jan 18 19:52:08 2008
@@ -470,3 +470,12 @@
import pexpect
except ImportError:
py.test.skip("pexpect not found")
+
+
+class Directory(py.test.collect.Directory):
+ def run(self):
+ # hack to exclude lib/ctypes/
+ if self.fspath == rootdir.join('lib', 'ctypes', 'test'):
+ py.test.skip("These are the original ctypes tests.\n"
+ "You can try to run them with 'pypy-c runtests.py'.")
+ return py.test.collect.Directory.run(self)
More information about the Pypy-commit
mailing list