Author: Philip Jenvey <pjen...@underboss.org> Branch: py3k Changeset: r60382:816887f2e726 Date: 2013-01-23 10:39 -0800 http://bitbucket.org/pypy/pypy/changeset/816887f2e726/
Log: merge default diff --git a/lib-python/conftest.py b/lib-python/conftest.py --- a/lib-python/conftest.py +++ b/lib-python/conftest.py @@ -17,8 +17,8 @@ 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.config.parse import parse_info +from pypy.tool.pytest.confpath import pypydir, rpythondir, testdir, testresultdir +from rpython.config.parse import parse_info pytest_plugins = "resultlog", rsyncdirs = ['.', '../pypy/'] @@ -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) @@ -522,7 +522,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/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -5,6 +5,9 @@ .. this is a revision shortly after release-2.0-beta1 .. startrev: 0e6161a009c6 +.. branch: split-rpython +Split rpython and pypy into seperate directories + .. branch: callback-jit Callbacks from C are now better JITted diff --git a/pypy/test_all.py b/pypy/test_all.py --- a/pypy/test_all.py +++ b/pypy/test_all.py @@ -24,7 +24,7 @@ print >> sys.stderr, __doc__ sys.exit(2) #Add toplevel repository dir to sys.path - sys.path.insert(0,os.path.dirname(os.path.dirname(__file__))) + sys.path.insert(0,os.path.dirname(os.path.dirname(os.path.realpath(__file__)))) import pytest import pytest_cov sys.exit(pytest.main(plugins=[pytest_cov])) 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) diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py --- a/pypy/tool/release/package.py +++ b/pypy/tool/release/package.py @@ -50,7 +50,7 @@ basename = 'pypy-c' if sys.platform == 'win32': basename += '.exe' - pypy_c = basedir.join(basename) + pypy_c = basedir.join('pypy', 'goal', basename) else: pypy_c = py.path.local(override_pypy_c) if not pypy_c.check(): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit