diff options
author | dirkbaechle <devnull@localhost> | 2012-10-03 11:40:03 (GMT) |
---|---|---|
committer | dirkbaechle <devnull@localhost> | 2012-10-03 11:40:03 (GMT) |
commit | af2b9e2f216459fcdc26f367aaaf528d8122283b (patch) | |
tree | 28972b25a5bc9ba70bece2621adcc24af4d357ad /test/sconsign | |
parent | 80cdf2501dfec07640481bf3d934add3e0cb0a04 (diff) | |
download | SCons-af2b9e2f216459fcdc26f367aaaf528d8122283b.zip SCons-af2b9e2f216459fcdc26f367aaaf528d8122283b.tar.gz SCons-af2b9e2f216459fcdc26f367aaaf528d8122283b.tar.bz2 |
- 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.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py index 865b607..3b43def 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) |