Fix a snafu in the new tests for reproducible archives that assumed a umask of 22.

This commit is contained in:
Nick Clifton 2023-09-26 16:27:28 +01:00
parent 940bb336cb
commit 854f72b36d
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2023-09-26 Nick Clifton <nickc@redhat.com>
* testsuite/binutils-all/ar.exp: Remove assumption of the setting
of umask when creating test archive files.
2023-09-25 Vsevolod Alekseyev <sevaa@sprynet.com>
PR 30792

View File

@ -598,7 +598,7 @@ proc replacing_non_deterministic_member { } {
# Since this archive is non-deterministic, we do not know what the
# user or group ids will be, so we have to use */* to match them.
set got [binutils_run $AR "tvO $archive"]
if ![string match "rw-r--r-- */* *${newer_length} *bintest.${obj} 0x*" $got] {
if ![string match "\[rw-\]* */* *${newer_length} *bintest.${obj} 0x*" $got] {
fail "$testname (wrong size, expected: $newer_length)"
return
}
@ -672,7 +672,7 @@ proc replacing_sde_deterministic_member { } {
# Since this archive has fixed source dates, but non-deterministic
# uid and gid values we have to use */* to match them.
set got [binutils_run $AR "tvO $archive"]
if ![string match "rw-r--r-- */* *${older_length} *bintest.${obj} 0x*" $got] {
if ![string match "\[rw-\]* */* *${older_length} *bintest.${obj} 0x*" $got] {
fail "$testname (wrong size, expected: $older_length)"
unsetenv SOURCE_DATE_EPOCH
return