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

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 641a75f12ebe1bde6ff6321567f45d02efbb8498..88f8373fca832abd0a7fdf106fe383a9ca5130ae 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -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

diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
index a0fa54d866d2163c8ac836a5c0bc95ce113ee805..aade419344e98b4bfa3e40b6da3ae4f0b64a28ec 100644 (file)
--- a/binutils/testsuite/binutils-all/ar.exp
+++ b/binutils/testsuite/binutils-all/ar.exp
@@ -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