summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-05-02 04:09:02 (GMT)
committerSteven Knight <knight@baldmt.com>2003-05-02 04:09:02 (GMT)
commit77568a787451a72ef62198db424ac62bbaf50294 (patch)
tree1c9a820e32ea1a4eb89d70d9ef895ed6557cb2a4 /src
parent8adc0857c2ebd976314a29ca338d6ce82ece251f (diff)
downloadSCons-77568a787451a72ef62198db424ac62bbaf50294.zip
SCons-77568a787451a72ef62198db424ac62bbaf50294.tar.gz
SCons-77568a787451a72ef62198db424ac62bbaf50294.tar.bz2
Fix regression tests that use test.whereis(). (Anthony Roach)
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/setupTests.py4
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)