[pypy-svn] pypy commit 55903b1dd06b: Automated merge with https://bitbucket.org/pypy/pypy

Bitbucket commits-noreply at bitbucket.org
Tue Dec 14 23:37:09 CET 2010


# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Alex Gaynor <alex.gaynor at gmail.com>
# Date 1292323361 18000
# Node ID 55903b1dd06be55352a1988cf48a6baf7ba994e0
# Parent  53e05faa128ca5a08b1dd95f706226694fc7245b
# Parent  f05147cddb7176830601931fc023a556842a35ca
Automated merge with https://bitbucket.org/pypy/pypy

--- a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import py
-import sys
-
-def pytest_collect_directory():
-    if '__pypy__' not in sys.builtin_module_names:
-        py.test.skip("these tests are meant to be run on top of pypy-c")
-
-def compile_so_file():
-    from pypy.translator.platform import platform
-    from pypy.translator.tool.cbuild import ExternalCompilationInfo
-    udir = py.test.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)
-
-def pytest_configure(config):
-    global sofile
-    sofile = compile_so_file()

--- a/pypy/jit/backend/llvm/test/conftest.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import py
-
-def pytest_collect_directory():
-    py.test.skip("llvm backend tests skipped for now")

--- a/pypy/rlib/rsdl/test/conftest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from pypy.rlib.rsdl.eci import check_sdl_installation, SDLNotInstalled
-import py
-
-def pytest_collect_directory():
-    try:
-        check_sdl_installation()
-    except SDLNotInstalled, e:
-        py.test.skip("SDL not installed(?): %s" % (e,))



More information about the Pypy-commit mailing list