Commits

Alex Gaynor committed 55903b1 Merge

Automated merge with https://bitbucket.org/pypy/pypy

  • Participants
  • Parent commits 53e05fa, f05147c

Comments (0)

Files changed (9)

 pypy/module/cpyext/src/*.o
 pypy/bin/pypy-c
 pypy/translator/jvm/src/pypy/*.class
-pypy/module/_stackless/test/
 pypy/module/cpyext/test/*.errors
 pypy/doc/*.html
 pypy/doc/basicblock.asc
 pypy/translator/benchmark/mako
 pypy/translator/benchmark/bench-custom.benchmark_result
 pypy/translator/benchmark/shootout_benchmarks
-pypy/module/_stackless/
 pypy/translator/goal/pypy-translation-snapshot
 pypy/translator/goal/pypy-c*
 pypy/translator/goal/*.exe
 lib_pypy/ctypes_config_cache/_*_*_.py
 pypy/translator/cli/query-descriptions
 pypy/doc/discussion/*.html
-pypy/doc/discussion/
 include/*.h
 include/*.inl
 pypy/doc/config/*.html
 pypy/doc/config/style.css
-pypy/doc/config/
 pypy/doc/jit/*.html
 pypy/doc/jit/style.css
 pypy/doc/image/lattice1.png
+greenlet = [svn]http://codespeak.net/svn/greenlet/trunk/c
+testrunner = [svn]http://codespeak.net/svn/pypy/build/testrunner
+lib_pypy/pyrepl = [svn]http://codespeak.net/svn/pyrepl/trunk/pyrepl/pyrepl
+lib_pypy/sqlite3 = [svn]http://codespeak.net/svn/pypy/pysqlite2
+80037 greenlet
+80037 lib_pypy/pyrepl
+80037 lib_pypy/sqlite3
+80037 testrunner

pypy/jit/backend/llvm/conftest.py

+import py
+
+def pytest_collect_directory():
+    py.test.skip("llvm backend tests skipped for now")

pypy/jit/backend/llvm/test/conftest.py

-import py
-
-def pytest_collect_directory():
-    py.test.skip("llvm backend tests skipped for now")

pypy/module/test_lib_pypy/conftest.py

+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_tests", "_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()

pypy/module/test_lib_pypy/ctypes_tests/conftest.py

-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()

pypy/rlib/rsdl/conftest.py

+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,))

pypy/rlib/rsdl/test/conftest.py

-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,))