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 /test/sconsign | |
| 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 'test/sconsign')
| -rw-r--r-- | test/sconsign/script/Configure.py | 2 | ||||
| -rw-r--r-- | test/sconsign/script/SConsignFile.py | 2 | ||||
| -rw-r--r-- | test/sconsign/script/Signatures.py | 2 | ||||
| -rw-r--r-- | test/sconsign/script/dblite.py | 2 | ||||
| -rw-r--r-- | test/sconsign/script/no-SConsignFile.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py index 125022d..7bf1f05 100644 --- a/test/sconsign/script/Configure.py +++ b/test/sconsign/script/Configure.py @@ -66,7 +66,7 @@ env = conf.Finish() test.run(arguments = '.') -sig_re = r'[0-9a-fA-F]{32}' +sig_re = r'[0-9a-fA-F]{32,64}' 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() diff --git a/test/sconsign/script/SConsignFile.py b/test/sconsign/script/SConsignFile.py index c54e17b..354bd05 100644 --- a/test/sconsign/script/SConsignFile.py +++ b/test/sconsign/script/SConsignFile.py @@ -141,7 +141,7 @@ test.write(['sub2', 'inc2.h'], r"""\ test.run(arguments = '--implicit-cache .') -sig_re = r'[0-9a-fA-F]{32}' +sig_re = r'[0-9a-fA-F]{32,64}' test.run_sconsign(arguments = ".sconsign", stdout = r"""=== .: diff --git a/test/sconsign/script/Signatures.py b/test/sconsign/script/Signatures.py index 0f21496..ecb8dc2 100644 --- a/test/sconsign/script/Signatures.py +++ b/test/sconsign/script/Signatures.py @@ -149,7 +149,7 @@ test.sleep() test.run(arguments = '. --max-drift=1') -sig_re = r'[0-9a-fA-F]{32}' +sig_re = r'[0-9a-fA-F]{32,64}' date_re = r'\S+ \S+ [ \d]\d \d\d:\d\d:\d\d \d\d\d\d' test.run_sconsign(arguments = "-e hello.exe -e hello.obj sub1/.sconsign", diff --git a/test/sconsign/script/dblite.py b/test/sconsign/script/dblite.py index 41cf7e2..1fcf8c0 100644 --- a/test/sconsign/script/dblite.py +++ b/test/sconsign/script/dblite.py @@ -109,7 +109,7 @@ test.sleep() test.run(arguments = '. --max-drift=1') -sig_re = r'[0-9a-fA-F]{32}' +sig_re = r'[0-9a-fA-F]{32,64}' date_re = r'\S+ \S+ [ \d]\d \d\d:\d\d:\d\d \d\d\d\d' if sys.platform == 'win32': diff --git a/test/sconsign/script/no-SConsignFile.py b/test/sconsign/script/no-SConsignFile.py index c345829..1598af4 100644 --- a/test/sconsign/script/no-SConsignFile.py +++ b/test/sconsign/script/no-SConsignFile.py @@ -152,7 +152,7 @@ test.write(['sub2', 'inc2.h'], r"""\ test.run(arguments = '--implicit-cache --tree=prune .') -sig_re = r'[0-9a-fA-F]{32}' +sig_re = r'[0-9a-fA-F]{32,64}' expect = r"""hello.c: %(sig_re)s \d+ \d+ hello.exe: %(sig_re)s \d+ \d+ |