Author: Ronan Lamy <[email protected]>
Branch: kill-ootype
Changeset: r65693:63f3ab72fb5e
Date: 2013-07-26 17:53 +0100
http://bitbucket.org/pypy/pypy/changeset/63f3ab72fb5e/
Log: meh, revert 3fc9da9637c3
Breaks test collection (e.g. "py.test rpython/" collects *nothing*)
but fixes buildbot failures.
diff --git a/rpython/jit/backend/arm/test/conftest.py
b/rpython/jit/backend/arm/test/conftest.py
--- a/rpython/jit/backend/arm/test/conftest.py
+++ b/rpython/jit/backend/arm/test/conftest.py
@@ -16,5 +16,7 @@
dest="run_translation_tests",
help="run tests that translate code")
-def pytest_ignore_collect(path, config):
- return not cpu.startswith('arm')
+def pytest_collect_directory(path, parent):
+ if not cpu.startswith('arm'):
+ py.test.skip("ARM(v7) tests skipped: cpu is %r" % (cpu,))
+pytest_collect_file = pytest_collect_directory
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
