Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r60150:48db825bde1b
Date: 2013-01-17 21:51 +0100
http://bitbucket.org/pypy/pypy/changeset/48db825bde1b/
Log: To fix later
diff --git a/rpython/conftest.py b/rpython/conftest.py
--- a/rpython/conftest.py
+++ b/rpython/conftest.py
@@ -7,7 +7,7 @@
# i'll investigate differences in collection tommorow, for now, can you just
# import the makemodule hook from pypy and add a comment that im responsible
# for fixing?
-#from pypy.conftest import pytest_pycollect_makemodule
+from pypy.conftest import pytest_pycollect_makemodule
cdir = realpath(join(dirname(__file__), 'translator', 'c'))
cache_dir = realpath(join(dirname(__file__), '_cache'))
@@ -38,6 +38,15 @@
set_platform(value, None)
def pytest_addoption(parser):
+ # XXX
+ # <ronny> Aquana, i just ensured that with the pypy conftest we get all
skips,
+ # i'll investigate differences in collection tommorow, for now, can you
just
+ # import the makemodule hook from pypy and add a comment that im
responsible
+ # for fixing?
+ from pypy.conftest import pytest_addoption
+ pytest_addoption(parser)
+
+
group = parser.getgroup("rpython options")
group.addoption('--view', action="store_true", dest="view", default=False,
help="view translation tests' flow graphs with Pygame")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
