fix extra_tests - apparently pytest_addoption can only be in toplevel…

… conftest.py

pytest-dev/pytest#3097 (comment)

extra_tests/conftest.py

@@ -8,10 +8,19 @@ def get_marker(item, name):
         # pytest < 3.6
         return item.get_marker(name=name)
 
+
 def pytest_runtest_setup(item):
     if get_marker(item, name='pypy_only'):
         if '__pypy__' not in sys.builtin_module_names:
             pytest.skip('PyPy-specific test')
 
+
 def pytest_configure(config):
     config.addinivalue_line("markers", "pypy_only: PyPy-specific test")
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--compiler-v", action="store_true",
+        help="Print to stdout the commands used to invoke the compiler")
+

extra_tests/hpy_tests/conftest.py

@@ -40,11 +40,6 @@ def pytest_configure(config):
         from _hpy_universal. Look at conftest.py for more details
     """)
 
-def pytest_addoption(parser):
-    parser.addoption(
-        "--compiler-v", action="store_true",
-        help="Print to stdout the commands used to invoke the compiler")
-
 @pytest.fixture(scope='session')
 def hpy_devel(request):
     from pypy.module._hpy_universal._vendored.hpy.devel import HPyDevel