Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r60169:b4732d7b026e
Date: 2013-01-18 11:37 +0100
http://bitbucket.org/pypy/pypy/changeset/b4732d7b026e/

Log:    call rpythons pytest_addoption in pypys

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -34,6 +34,9 @@
     option = config.option
 
 def pytest_addoption(parser):
+    from rpython.conftest import pytest_addoption
+    pytest_addoption(parser)
+    
     group = parser.getgroup("pypy options")
     group.addoption('-A', '--runappdirect', action="store_true",
            default=False, dest="runappdirect",
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to