summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2012-09-10 12:19:42 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2012-09-10 12:19:42 (GMT)
commit01beb69c7dacc0a59acd568239322716da6e55d0 (patch)
tree2bfd9798a1d21f03ceb69ea6c0c870d9bcba7f7c /Lib
parentb517596721e3036ce914a8a065500b77ee83bd97 (diff)
downloadcpython-01beb69c7dacc0a59acd568239322716da6e55d0.zip
cpython-01beb69c7dacc0a59acd568239322716da6e55d0.tar.gz
cpython-01beb69c7dacc0a59acd568239322716da6e55d0.tar.bz2
backport from the trunk, to fix test_tools with srcdir != builddir
changeset: 77827:c23b442b5d5e user: Antoine Pitrou <solipsis@pitrou.net> date: Thu Jun 28 01:20:26 2012 +0200 summary: Avoid using scrdir, it's broken. changeset: 77826:f0e58e778215 user: Neil Schemenauer <nas@arctrix.com> date: Wed Jun 27 15:58:37 2012 -0600 summary: Fix bug in test_tools that prevented building is separate directory.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_tools.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_tools.py b/Lib/test/test_tools.py
index cfe13ac..42816a2 100644
--- a/Lib/test/test_tools.py
+++ b/Lib/test/test_tools.py
@@ -18,8 +18,8 @@ if not sysconfig.is_python_build():
# and run the tests in that case too?
raise unittest.SkipTest('test irrelevant for an installed Python')
-srcdir = sysconfig.get_config_var('projectbase')
-basepath = os.path.join(os.getcwd(), srcdir, 'Tools')
+basepath = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),
+ 'Tools')
scriptsdir = os.path.join(basepath, 'scripts')