Author: mattip
Branch:
Changeset: r60367:de67d376b3df
Date: 2013-01-23 14:09 +0200
http://bitbucket.org/pypy/pypy/changeset/de67d376b3df/
Log: adapt to moved files
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -17,7 +17,7 @@
from pypy.conftest import option as pypy_option
from pypy.tool.pytest import appsupport
-from pypy.tool.pytest.confpath import pypydir, testdir, testresultdir
+from pypy.tool.pytest.confpath import pypydir, rpythondir, testdir,
testresultdir
from rpython.config.parse import parse_info
pytest_plugins = "resultlog",
@@ -40,7 +40,7 @@
dest="unittest_filter", help="Similar to -k, XXX")
def gettimeout(timeout):
- from test import pystone
+ from rpython.translator.test import rpystone
if timeout.endswith('mp'):
megapystone = float(timeout[:-2])
t, stone = pystone.Proc0(10000)
@@ -584,7 +584,7 @@
watchdog_name = 'watchdog_nt.py'
else:
watchdog_name = 'watchdog.py'
- watchdog_script = pypydir.join('tool', watchdog_name)
+ watchdog_script = rpythondir.join('tool', watchdog_name)
regr_script = pypydir.join('tool', 'pytest',
'run-script', 'regrverbose.py')
diff --git a/pypy/tool/pytest/confpath.py b/pypy/tool/pytest/confpath.py
--- a/pypy/tool/pytest/confpath.py
+++ b/pypy/tool/pytest/confpath.py
@@ -1,8 +1,10 @@
import py
import pypy
+import rpython
from pypy.tool import lib_pypy
pypydir = py.path.local(pypy.__file__).dirpath()
+rpythondir = py.path.local(rpython.__file__).dirpath()
distdir = pypydir.dirpath()
testresultdir = distdir.join('testresult')
assert pypydir.check(dir=1)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
