From 5ff6ae6177ffcc426aae5c5386d13017d2f58ca6 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Tue, 3 Sep 2019 00:26:05 -0400
Subject: [PATCH] * tests/scripts/features/archives: Fix expected long ar name
 output.

---
 tests/scripts/features/archives | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
index 87a50079..8d88ee38 100644
--- a/tests/scripts/features/archives
+++ b/tests/scripts/features/archives
@@ -56,6 +56,7 @@ if ($? == 0) {
 # Some versions of ar print different things on creation.  Find out.
 unlink('libxx.a');
 my $created = `$ar $arflags libxx.a a1.o $redir`;
+$created =~ s/a1\.o/#OBJECT#/g;
 
 # Some versions of ar print different things on add.  Find out.
 my $add = `$ar $arflags libxx.a a2.o $redir`;
@@ -68,7 +69,8 @@ $repl =~ s/a2\.o/#OBJECT#/g;
 unlink('libxx.a');
 
 # Very simple
-my $answer = "$ar $arflags libxx.a a1.o\n$created";
+($_ = $created) =~ s/#OBJECT#/a1.o/g;
+my $answer = "$ar $arflags libxx.a a1.o\n$_";
 if ($port_type eq 'VMS-DCL') {
   $answer = 'library /replace libxx.a a1.o';
 }
@@ -220,7 +222,9 @@ if ($osname ne 'VMS') {
     my $pre = '1234567890123456';
     my $lib = 'libxx.a';
     my $cr = $created;
-    $cr =~ s#a1\.o#${pre}a#;
+    $cr =~ s/#OBJECT#/${pre}a/g;
+    my $ad = $add;
+    $ad =~ s/#OBJECT#/${pre}b/g;
 
     run_make_test(qq!
 # Both member names > 16 characters long
@@ -230,7 +234,7 @@ default: $lib(${pre}a) $lib(${pre}b)
 
 $pre%: ; touch \$\@
 !,
-                  $arvar, "touch ${pre}a\n$ar $arflags $lib ${pre}a\n${cr}touch ${pre}b\n$ar $arflags $lib ${pre}b\na - ${pre}b\nrm ${pre}a ${pre}b\n");
+                  $arvar, "touch ${pre}a\n$ar $arflags $lib ${pre}a\n${cr}touch ${pre}b\n$ar $arflags $lib ${pre}b\n${ad}rm ${pre}a ${pre}b\n");
 
     # Run it again; nothing should happen
     run_make_test(undef, $arvar, "#MAKE#: Nothing to be done for 'default'.\n");