diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-01-30 23:03:02 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-01-30 23:03:02 (GMT) |
| commit | 0d4c31c7adc62f215e6a73d2efa7c2787bee6c83 (patch) | |
| tree | 650c24f1eab8206073a002df5b33925c4c8d958a /test/sconsign | |
| parent | 209d73e6c78978371915f14384bb8fff1902e386 (diff) | |
| download | SCons-0d4c31c7adc62f215e6a73d2efa7c2787bee6c83.zip SCons-0d4c31c7adc62f215e6a73d2efa7c2787bee6c83.tar.gz SCons-0d4c31c7adc62f215e6a73d2efa7c2787bee6c83.tar.bz2 | |
Fix tests broken by Configure temp file naming changes
Diffstat (limited to 'test/sconsign')
| -rw-r--r-- | test/sconsign/script/Configure.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py index 679f084..125022d 100644 --- a/test/sconsign/script/Configure.py +++ b/test/sconsign/script/Configure.py @@ -55,7 +55,6 @@ CC_file = re.escape(CC_file) # in the expected output because paths in the .sconsign files are # canonicalized to use / as the separator. -_sconf_temp_conftest_0_c = '.sconf_temp/conftest_0.c' test.write('SConstruct', """ import os @@ -69,6 +68,7 @@ test.run(arguments = '.') sig_re = r'[0-9a-fA-F]{32}' date_re = r'\S+ \S+ [ \d]\d \d\d:\d\d:\d\d \d\d\d\d' +_sconf_temp_conftest_0_c = '.sconf_temp/conftest_%(sig_re)s_0.c'%locals() # Note: There's a space at the end of the '.*': line, because the # Value node being printed actually begins with a newline. It would @@ -76,13 +76,13 @@ date_re = r'\S+ \S+ [ \d]\d \d\d:\d\d:\d\d \d\d\d\d' expect = r"""=== .: SConstruct: None \d+ \d+ === .sconf_temp: -conftest_0.c: +conftest_%(sig_re)s_0.c: '.*': #include "math.h" %(sig_re)s \[.*\] -conftest_0%(_obj)s: +conftest_%(sig_re)s_0_%(sig_re)s%(_obj)s: %(_sconf_temp_conftest_0_c)s: %(sig_re)s \d+ \d+ %(CC)s: %(sig_re)s \d+ \d+ %(sig_re)s \[.*\] |