From: Nick Clifton <nickc@redhat.com>
Date: Tue, 26 Sep 2023 15:27:28 +0000 (+0100)
Subject: Fix a snafu in the new tests for reproducible archives that assumed a umask of 22.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=854f72b36dc72dc23b24563c5e7f43efc373b712;p=binutils-gdb.git

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 641a75f12eb..88f8373fca8 100644
--- 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 a0fa54d866d..aade419344e 100644
--- 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