Add the current PYTHONPATH to runtest.py so tests can pick up distutils in non-standa...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@642 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/runtest.py b/runtest.py
index eff0a358b64905fb79d4a08a5de99c5c16f4b44c..b2176e9c660c9009cd9821503fa9523c7fb2d242 100644 (file)
--- 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)
 

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b35be688464f99cff63c66e49b6f114672390e4d..6bc2cc8177eb0fc6dde7d5ae92607900552f6dc9 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -21,6 +21,9 @@ RELEASE 0.14 - XXX
 
   - Remove the "platform" argument from tool specifications.
 
+  - Propogate PYTHONPATH when running the regression tests so distutils
+    can be found in non-standard locations.
+
   From Allen Bierbaum:
 
   - Pass an Environment to the Options validator method, and