From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 12 Apr 2003 11:31:21 +0000 (+0000)
Subject: Add the current PYTHONPATH to runtest.py so tests can pick up distutils in non-standa... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6045eea877914f93a07441aa7b782033465d5727;p=scons.git

Add the current PYTHONPATH to runtest.py so tests can pick up distutils in non-standard locations.  (Chad Austin)


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 eff0a358..b2176e9c 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)
 
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b35be688..6bc2cc81 100644
--- 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