summaryrefslogtreecommitdiffstats
path: root/runtest.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-04-12 11:31:21 (GMT)
committerSteven Knight <knight@baldmt.com>2003-04-12 11:31:21 (GMT)
commit8acc37bd923f8bb6621c0fe3d36786151e884c6d (patch)
tree7b27ffc4c5c6970211c4063d07c6cebbfa265b40 /runtest.py
parent5e229b4f577acd2a89196c74196997d2a6f017cc (diff)
downloadSCons-8acc37bd923f8bb6621c0fe3d36786151e884c6d.zip
SCons-8acc37bd923f8bb6621c0fe3d36786151e884c6d.tar.gz
SCons-8acc37bd923f8bb6621c0fe3d36786151e884c6d.tar.bz2
Add the current PYTHONPATH to runtest.py so tests can pick up distutils in non-standard locations. (Chad Austin)
Diffstat (limited to 'runtest.py')
-rw-r--r--runtest.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/runtest.py b/runtest.py
index eff0a35..b2176e9 100644
--- a/runtest.py
+++ b/runtest.py
@@ -313,11 +313,16 @@ os.environ['SCONS_CWD'] = cwd
os.environ['SCONS_VERSION'] = version
+old_pythonpath = os.environ.get('PYTHONPATH')
os.environ['PYTHONPATH'] = pythonpath_dir + \
os.pathsep + \
os.path.join(cwd, 'build', 'etc') + \
os.pathsep + \
os.path.join(cwd, 'etc')
+if old_pythonpath:
+ os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + \
+ os.pathsep + \
+ old_pythonpath
os.chdir(scons_script_dir)