bug-make
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

patch to fix features/archives test 10 on sunos


From: Dmitry Goncharov
Subject: patch to fix features/archives test 10 on sunos
Date: Mon, 9 Sep 2019 22:30:23 -0400

Good morning.

ar add output is system dependent.
This makes features/archives test 10 fail on sunos.
This patch uses the output of `ar rv` rather than a hardcoded string.

linux
$ ar rv libxx.a 1234567890123456b
a - 1234567890123456b

sunos
$ ar rv libxx.a 1234567890123456b
a - 1234567890123456b
ar: writing libxx.a

diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
index 87a5007..16372fa 100644
--- a/tests/scripts/features/archives
+++ b/tests/scripts/features/archives
@@ -221,6 +221,8 @@ if ($osname ne 'VMS') {
     my $lib = 'libxx.a';
     my $cr = $created;
     $cr =~ s#a1\.o#${pre}a#;
+    my $a = $add;
+    $a  =~ s/#OBJECT#/${pre}b/;

     run_make_test(qq!
 # Both member names > 16 characters long
@@ -230,7 +232,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${a}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");

regards, Dmitry



reply via email to

[Prev in Thread] Current Thread [Next in Thread]