diff options
| author | Steven Knight <knight@baldmt.com> | 2003-04-12 11:31:21 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-04-12 11:31:21 (GMT) |
| commit | 8acc37bd923f8bb6621c0fe3d36786151e884c6d (patch) | |
| tree | 7b27ffc4c5c6970211c4063d07c6cebbfa265b40 | |
| parent | 5e229b4f577acd2a89196c74196997d2a6f017cc (diff) | |
| download | SCons-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)
| -rw-r--r-- | runtest.py | 5 | ||||
| -rw-r--r-- | src/CHANGES.txt | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -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 |