[pypy-svn] pypy commit 11dd42c70507: yet another approach for skipping whole directories, hopefully this one will work

Bitbucket commits-noreply at bitbucket.org
Tue Dec 14 14:50:55 CET 2010


# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Antonio Cuni <anto.cuni at gmail.com>
# Date 1292334629 -3600
# Node ID 11dd42c70507da9dc1ae3c2692f4ccaa4b3ade90
# Parent  8d549ed5ab18b56cf2bb0707e71a1c7d3eca0920
yet another approach for skipping whole directories, hopefully this one will work

--- /dev/null
+++ b/pypy/jit/backend/cli/test/conftest.py
@@ -0,0 +1,4 @@
+import py
+
+def pytest_ignore_collect(path):
+    return True

--- a/pypy/rlib/rsdl/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,))

--- /dev/null
+++ b/pypy/jit/backend/llvm/test/conftest.py
@@ -0,0 +1,4 @@
+import py
+
+def pytest_ignore_collect(path):
+    return True

--- /dev/null
+++ b/pypy/rlib/rsdl/test/conftest.py
@@ -0,0 +1,10 @@
+from pypy.rlib.rsdl.eci import check_sdl_installation, SDLNotInstalled
+import py
+
+def pytest_ignore_collect(path):
+    try:
+        check_sdl_installation()
+    except SDLNotInstalled, e:
+        return True
+    else:
+        return False

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

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



More information about the Pypy-commit mailing list