summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-11-01 17:38:22 +0100
committerGeorg Brandl <georg@python.org>2012-11-01 17:38:22 +0100
commit21d57d3125feb59a38432b08bb9ffea9d0b1855c (patch)
tree66c237437aed8f942a5544e7b250c91168c324c0
parentc411b51fbbdaae201331123c5a449ea7f5f8b0c8 (diff)
downloadsphinx-git-21d57d3125feb59a38432b08bb9ffea9d0b1855c.tar.gz
Fix running tests under Python 3 without tox.
-rwxr-xr-xtests/run.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/run.py b/tests/run.py
index 8b3bf844d..4cd4a7660 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -18,14 +18,14 @@ if sys.version_info >= (3, 0):
from distutils.util import copydir_run_2to3
testroot = path.dirname(__file__) or '.'
if 'BUILD_TEST_PATH' in environ:
- # for tox test.
+ # for tox testing
newroot = environ['BUILD_TEST_PATH']
- # tox install sphinx package, not need sys.path.insert.
+ # tox installs the sphinx package, no need for sys.path.insert
else:
newroot = path.join(testroot, path.pardir, 'build')
newroot = path.join(newroot, listdir(newroot)[0], 'tests')
# always test the sphinx package from build/lib/
- sys.path.insert(0, path.join(newroot, path.pardir))
+ sys.path.insert(0, path.abspath(path.join(newroot, path.pardir)))
copydir_run_2to3(testroot, newroot)
# switch to the converted dir so nose tests the right tests
chdir(newroot)