diff options
| author | Jacob Cassagnol <87133045+jcassagnol-public@users.noreply.github.com> | 2021-11-01 23:14:14 (GMT) |
|---|---|---|
| committer | Jacob Cassagnol <87133045+jcassagnol-public@users.noreply.github.com> | 2021-11-01 23:14:14 (GMT) |
| commit | a1ef39ffa7099f800d5e8f31361dd59770c68b27 (patch) | |
| tree | 449ecc186b53d81a1ebfafa646512d45a2318419 /testing | |
| parent | d8f3bc27df1525893446869af12dea8ac46a49e5 (diff) | |
| download | SCons-a1ef39ffa7099f800d5e8f31361dd59770c68b27.zip SCons-a1ef39ffa7099f800d5e8f31361dd59770c68b27.tar.gz SCons-a1ef39ffa7099f800d5e8f31361dd59770c68b27.tar.bz2 | |
Half the failing testcases fixed.
Still failing on:
SCons/UtilTests.py
test/Configure/ConfigureDryRunError.py
test/Configure/implicit-cache.py
test/Configure/option--config.py
test/option/hash-format.py
test/option/option-n.py
test/question/Configure.py
These tests all have hardcoded md5 sums or use md5 directly
Next commit should fix it so the md5-specific tests are skipped if fips mode detected.
Also will figure out a way around the hardcoded m5sums.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestSCons.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index 50280be..2a19818 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -1415,10 +1415,10 @@ SConscript(sconscript) for ext, flag in bld_desc: # each file in TryBuild if ext in ['.c', '.cpp']: conf_filename = re.escape(os.path.join(sconf_dir, "conftest")) +\ - r'_[a-z0-9]{32}_\d+%s' % re.escape(ext) + r'_[a-z0-9]{32,64}_\d+%s' % re.escape(ext) elif ext == '': conf_filename = re.escape(os.path.join(sconf_dir, "conftest")) +\ - r'_[a-z0-9]{32}(_\d+_[a-z0-9]{32})?' + r'_[a-z0-9]{32,64}(_\d+_[a-z0-9]{32,64})?' else: # We allow the second hash group to be optional because @@ -1430,7 +1430,7 @@ SConscript(sconscript) # TODO: perhaps revisit and/or fix file naming for intermediate files in # Configure context logic conf_filename = re.escape(os.path.join(sconf_dir, "conftest")) +\ - r'_[a-z0-9]{32}_\d+(_[a-z0-9]{32})?%s' % re.escape(ext) + r'_[a-z0-9]{32,64}_\d+(_[a-z0-9]{32,64})?%s' % re.escape(ext) if flag == self.NCR: # NCR = Non Cached Rebuild |