Commits

Anonymous committed 7079641

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

Comments (0)

Files changed (2)

 
 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)
 
 
   - 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