From 8acc37bd923f8bb6621c0fe3d36786151e884c6d Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sat, 12 Apr 2003 11:31:21 +0000 Subject: Add the current PYTHONPATH to runtest.py so tests can pick up distutils in non-standard locations. (Chad Austin) --- runtest.py | 5 +++++ src/CHANGES.txt | 3 +++ 2 files changed, 8 insertions(+) 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) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b35be68..6bc2cc8 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 -- cgit v0.12