diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/setupTests.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 196c28d..0c23939 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -98,6 +98,9 @@ RELEASE 0.14 - XXX - Deprecate the old SetJobs() and GetJobs() functions in favor of using the new generic {Set,Get}Option() functions. + - Fix a number of tests that searched for a Fortran compiler using the + external PATH instead of what SCons would use. + From David Snopek: - Contribute the "Autoscons" code for Autoconf-like checking for diff --git a/src/setupTests.py b/src/setupTests.py index 055475e..6457fff 100644 --- a/src/setupTests.py +++ b/src/setupTests.py @@ -32,6 +32,7 @@ import os import os.path import shutil import string +import sys import TestSCons @@ -68,7 +69,8 @@ test.subdir('root') root = test.workpath('root') -standard_lib = '%s/usr/lib/python1.5/site-packages/' % root +v = string.split(string.split(sys.version)[0], '.') +standard_lib = '%s/usr/lib/python%s.%s/site-packages/' % (root, v[0], v[1]) standalone_lib = '%s/usr/lib/scons' % root version_lib = '%s/usr/lib/%s' % (root, scons_version) |