[pypy-commit] pypy apptest-file: Avoid importing rpython when running -A tests

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: apptest-file
Changeset: r95315:4f36bf5a1d30
Date: 2018-11-14 19:08 +0000
http://bitbucket.org/pypy/pypy/changeset/4f36bf5a1d30/

Log:	Avoid importing rpython when running -A tests

diff --git a/pypy/module/_continuation/test/conftest.py b/pypy/module/_continuation/test/conftest.py
--- a/pypy/module/_continuation/test/conftest.py
+++ b/pypy/module/_continuation/test/conftest.py
@@ -1,7 +1,7 @@
-import pytest
 import sys
 
 def pytest_configure(config):
-    if sys.platform.startswith('linux'):
+    if (not config.getoption('runappdirect') and
+            sys.platform.startswith('linux')):
         from rpython.rlib.rvmprof.cintf import configure_libbacktrace_linux
         configure_libbacktrace_linux()
diff --git a/pypy/module/_cppyy/test/conftest.py b/pypy/module/_cppyy/test/conftest.py
--- a/pypy/module/_cppyy/test/conftest.py
+++ b/pypy/module/_cppyy/test/conftest.py
@@ -37,6 +37,8 @@
 disabled = None
 
 def pytest_configure(config):
+    if config.getoption('runappdirect'):
+        return
     if py.path.local.sysfind('genreflex') is None:
         import pypy.module._cppyy.capi.loadable_capi as lcapi
         try:
diff --git a/pypy/module/cpyext/test/conftest.py b/pypy/module/cpyext/test/conftest.py
--- a/pypy/module/cpyext/test/conftest.py
+++ b/pypy/module/cpyext/test/conftest.py
@@ -16,10 +16,9 @@
     space = gettestobjspace(usemodules=['time'])
     space.getbuiltinmodule("time")
 
-def pytest_ignore_collect(path, config):
     # ensure additional functions are registered
     import pypy.module.cpyext.test.test_cpyext
-    return False
+
 
 def pytest_funcarg__api(request):
     return request.cls.api
diff --git a/pypy/module/pypyjit/test/conftest.py b/pypy/module/pypyjit/test/conftest.py
deleted file mode 100644
--- a/pypy/module/pypyjit/test/conftest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def pytest_addoption(parser):
-    group = parser.getgroup("pypyjit options")
-    group.addoption("--pypy", action="store", default=None, dest="pypy_c",
-                    help="DEPRECATED: use this in test_pypy_c instead")
-# XXX kill the corresponding section in the buildbot run,
-# which (as far as I can tell) ignores that option entirely and does
-# the same as the regular py.test.