[pypy-commit] pypy default: Copy from conftest.py from ../ctypes/test/.

arigo noreply at buildbot.pypy.org
Wed Apr 3 13:10:07 CEST 2013


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r62969:cf959bd6387f
Date: 2013-04-03 13:08 +0200
http://bitbucket.org/pypy/pypy/changeset/cf959bd6387f/

Log:	Copy from conftest.py from ../ctypes/test/.

diff --git a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py b/pypy/module/test_lib_pypy/cffi_tests/conftest.py
copy from pypy/module/test_lib_pypy/ctypes_tests/conftest.py
copy to pypy/module/test_lib_pypy/cffi_tests/conftest.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/conftest.py
@@ -1,27 +1,5 @@
-import py, pytest
 import sys
 
 def pytest_ignore_collect(path):
     if '__pypy__' not in sys.builtin_module_names:
         return True
-
-def compile_so_file():
-    from rpython.translator.platform import platform
-    from rpython.translator.tool.cbuild import ExternalCompilationInfo
-    udir = pytest.ensuretemp('_ctypes_test')
-    cfile = py.path.local(__file__).dirpath().join("_ctypes_test.c")
-
-    if sys.platform == 'win32':
-        libraries = ['oleaut32']
-    else:
-        libraries = []
-    eci = ExternalCompilationInfo(libraries=libraries)
-
-    return platform.compile([cfile], eci, str(udir.join('_ctypes_test')),
-                            standalone=False)
-
-# we need to run after the "tmpdir" plugin which installs pytest.ensuretemp
- at pytest.mark.trylast
-def pytest_configure(config):
-    global sofile
-    sofile = compile_so_file()


More information about the pypy-commit mailing list