summaryrefslogtreecommitdiff
path: root/test/sconsign
diff options
context:
space:
mode:
authordirkbaechle <devnull@localhost>2012-10-03 13:40:03 +0200
committerdirkbaechle <devnull@localhost>2012-10-03 13:40:03 +0200
commit1c13198a862686081f1991dd355900e5fdff8690 (patch)
tree28972b25a5bc9ba70bece2621adcc24af4d357ad /test/sconsign
parent24b4400a2163360e58ed5117bdc3cfafb1f0cfa8 (diff)
downloadscons-1c13198a862686081f1991dd355900e5fdff8690.tar.gz
- final changes for bug2872 "Fix tests on Buildbot slaves", mainly switched all RPM tests to using the new rpmutils module
Diffstat (limited to 'test/sconsign')
-rw-r--r--test/sconsign/script/Configure.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py
index 865b6075..3b43defd 100644
--- a/test/sconsign/script/Configure.py
+++ b/test/sconsign/script/Configure.py
@@ -40,7 +40,11 @@ _obj = TestSCons._obj
test = TestSConsign.TestSConsign(match = TestSConsign.match_re,
diff = TestSConsign.diff_re)
-CC = test.detect('CC', norm=1)
+# Note: Here we pass the full search PATH of our current system to
+# the detect() method. This way we try to ensure that we find the same
+# compiler executable as the SConstruct below, which uses
+# os.environ['PATH'] too.
+CC = test.detect('CC', ENV={'PATH' : os.environ.get('PATH','')}, norm=1)
CC_dir, CC_file = os.path.split(CC)
CC = re.escape(CC)