patch to fix features/archives test 10 on sunos

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

patch to fix features/archives test 10 on sunos

Gnu - Make - Bugs mailing list
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

_______________________________________________
Bug-make mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/bug-make
Reply | Threaded
Open this post in threaded view
|

Re: patch to fix features/archives test 10 on sunos

Paul Smith-20
On Mon, 2019-09-09 at 22:30 -0400, Dmitry Goncharov via Bug reports and
discussion for GNU make wrote:
> ar add output is system dependent.

Thanks Dmitry; I had already made basically that same change.  See the
latest Git master (pushed this morning).

I plan to make a new release candidate this week.  I was going to do it
this past weekend but unfortunately I needed to do some gnulib-related
work (actually Bruno ended up doing most of the work) first.

Cheers!


_______________________________________________
Bug-make mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/bug-make
Reply | Threaded
Open this post in threaded view
|

Re: patch to fix features/archives test 10 on sunos

Eli Zaretskii
> From: Paul Smith <[hidden email]>
> Date: Tue, 10 Sep 2019 08:36:24 -0400
>
> I plan to make a new release candidate this week.

Did you have a chance to review the patch I proposed in
https://lists.gnu.org/archive/html/bug-make/2019-08/msg00106.html?
I'd like to install it.

Also, regarding SV 56449: are you okay with reverting that change,
given the discussion and OP's agreement with me?

Thanks.

_______________________________________________
Bug-make mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/bug-make
Reply | Threaded
Open this post in threaded view
|

Re: patch to fix features/archives test 10 on sunos

Paul Smith-20
On Tue, 2019-09-10 at 17:47 +0300, Eli Zaretskii wrote:
> > From: Paul Smith <[hidden email]>
> > Date: Tue, 10 Sep 2019 08:36:24 -0400
> >
> > I plan to make a new release candidate this week.
>
> Did you have a chance to review the patch I proposed in
> https://lists.gnu.org/archive/html/bug-make/2019-08/msg00106.html?
> I'd like to install it.

Oh I already made that change... plus in another place that did similar
things.  Sorry I should have added a note about it.

> Also, regarding SV 56449: are you okay with reverting that change,
> given the discussion and OP's agreement with me?

Yes, that's fine.

I do think there's some uncleanliness about this.  It's upsetting that
Windows behaves so differently between the command line and batch file.
It makes it very difficult to implement any sort of batch mode
fallback.  Oh well.


_______________________________________________
Bug-make mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/bug-make
Reply | Threaded
Open this post in threaded view
|

Re: patch to fix features/archives test 10 on sunos

Eli Zaretskii
> From: Paul Smith <[hidden email]>
> Cc: [hidden email], [hidden email]
> Date: Tue, 10 Sep 2019 11:47:35 -0400
>
> On Tue, 2019-09-10 at 17:47 +0300, Eli Zaretskii wrote:
> > > From: Paul Smith <[hidden email]>
> > > Date: Tue, 10 Sep 2019 08:36:24 -0400
> > >
> > > I plan to make a new release candidate this week.
> >
> > Did you have a chance to review the patch I proposed in
> > https://lists.gnu.org/archive/html/bug-make/2019-08/msg00106.html?
> > I'd like to install it.
>
> Oh I already made that change... plus in another place that did similar
> things.  Sorry I should have added a note about it.

OK, thanks.  No harm done.

> > Also, regarding SV 56449: are you okay with reverting that change,
> > given the discussion and OP's agreement with me?
>
> Yes, that's fine.

Done.

> I do think there's some uncleanliness about this.  It's upsetting that
> Windows behaves so differently between the command line and batch file.
> It makes it very difficult to implement any sort of batch mode
> fallback.  Oh well.

Agreed.

Btw, I see you added support for dirent.d_type for dirent functions
emulation when compiling with MSVC, but I don't think Make uses this
anywhere, except when building with glibc.  In particular, the
HAVE_STRUCT_DIRENT_D_TYPE macro doesn't seem to be referenced
anywhere.  Did I miss something?

_______________________________________________
Bug-make mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/bug-make
Reply | Threaded
Open this post in threaded view
|

Re: patch to fix features/archives test 10 on sunos

Paul Smith-20
On Tue, 2019-09-10 at 19:17 +0300, Eli Zaretskii wrote:
> Btw, I see you added support for dirent.d_type for dirent functions
> emulation when compiling with MSVC, but I don't think Make uses this
> anywhere, except when building with glibc.  In particular, the
> HAVE_STRUCT_DIRENT_D_TYPE macro doesn't seem to be referenced
> anywhere.  Did I miss something?

It's used in both src/dir.c and in lib/glob.c.

I believe Windows uses GNU make's embedded lib/glob.c and without this
it doesn't properly handle globbing of directories-only by appending
"/".

Cheers!


_______________________________________________
Bug-make mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/bug-make
Reply | Threaded
Open this post in threaded view
|

Re: patch to fix features/archives test 10 on sunos

Eli Zaretskii
> From: Paul Smith <[hidden email]>
> Cc: [hidden email]
> Date: Tue, 10 Sep 2019 12:35:18 -0400
>
> > Btw, I see you added support for dirent.d_type for dirent functions
> > emulation when compiling with MSVC, but I don't think Make uses this
> > anywhere, except when building with glibc.  In particular, the
> > HAVE_STRUCT_DIRENT_D_TYPE macro doesn't seem to be referenced
> > anywhere.  Did I miss something?
>
> It's used in both src/dir.c and in lib/glob.c.

Right.  I looked in make-4.2.90, instead of in Git.

_______________________________________________
Bug-make mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/bug-make