* tests/scripts/features/archives: [SV 54395] Support non-GNU ar.

diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
index 5662de42c39cc165f444a45bd3f2edbc5e1a08e5..87a5007992044d4b2c13f4bccd223562467704a1 100644 (file)
--- a/tests/scripts/features/archives
+++ b/tests/scripts/features/archives
@@ -218,7 +218,9 @@ if ($osname eq 'VMS') {
 
 if ($osname ne 'VMS') {
     my $pre = '1234567890123456';
-    my $lib = 'foo.a';
+    my $lib = 'libxx.a';
+    my $cr = $created;
+    $cr =~ s#a1\.o#${pre}a#;
 
     run_make_test(qq!
 # Both member names > 16 characters long
@@ -228,7 +230,7 @@ default: $lib(${pre}a) $lib(${pre}b)
 
 $pre%: ; touch \$\@
 !,
-                  $arvar, "touch ${pre}a\n$ar $arflags $lib ${pre}a\n$ar: creating $lib\na - ${pre}a\ntouch ${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\na - ${pre}b\nrm ${pre}a ${pre}b\n");
 
     # Run it again; nothing should happen
     run_make_test(undef, $arvar, "#MAKE#: Nothing to be done for 'default'.\n");