[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Modernize, improve and extend tests `subobj*.test'.
From: |
Stefano Lattarini |
Subject: |
Re: [PATCH] Modernize, improve and extend tests `subobj*.test'. |
Date: |
Sun, 8 Aug 2010 12:44:32 +0200 |
User-agent: |
KMail/1.13.3 (Linux/2.6.30-2-686; KDE/4.4.4; i686; ; ) |
At Sunday 08 August 2010, Ralf Wildenhues wrote:
> OK for maint with nits below addressed, thanks!
> Ralf
>
> > --- a/tests/subobj2.test
> > +++ b/tests/subobj2.test
> > @@ -1,5 +1,5 @@
> >
> > #! /bin/sh
> >
> > -# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
> > +# Copyright (C) 1999, 2001, 2002, 2010 Free Software Foundation,
> > Inc.
> >
> > #
> > # This program is free software; you can redistribute it and/or
> > modify # it under the terms of the GNU General Public License
> > as published by
> >
> > @@ -33,6 +33,8 @@ END
> >
> > $ACLOCAL
> > $AUTOMAKE
> >
> > -$FGREP 'generic/a.$(OBJEXT)' Makefile.in
> > +grep '^generic/a\.\$(OBJEXT):' Makefile.in
>
> Some day I'll add initial and trailing space to the target names of
> all generated rules to see how portable our test suite is ... ;-)
I assume the change is OK, though... is it?
> > --- a/tests/subobj7.test
> > +++ b/tests/subobj7.test
> >
> > @@ -37,6 +35,6 @@ END
> >
> > $ACLOCAL
> > $AUTOMAKE --add-missing
> >
> > -grep wish_CFLAGS Makefile.in && Exit 1
> > +$FGREP wish_CFLAGS Makefile.in && Exit 1
>
> Tsk.
Yes, quite useless. Reverted.
> > --- a/tests/subobj8.test
> > +++ b/tests/subobj8.test
> >
> > @@ -33,12 +36,14 @@ cat > Makefile.am << 'END'
> >
> > SUBDIRS = foo
> > END
> >
> > -cat > foo/Makefile.am << 'EOF'
> > +cat > foo/Makefile.am << 'END'
> >
> > AUTOMAKE_OPTIONS = subdir-objects
> > bin_PROGRAMS = mumble
> > mumble_SOURCES = bar/a.c
> >
> > -EOF
> > +END
>
> Another one of those needless changes.
It is to enhance consistency within the test script... should I revert
it nonetheless?
> > --- a/tests/subobj9.test
> > +++ b/tests/subobj9.test
> >
> > @@ -65,17 +64,19 @@ $AUTOMAKE -a
> >
> > -$MAKE distcheck 2>&1 | tee out
> > +$MAKE distcheck >out 2>&1 || { cat out; Exit 1; }
> > +cat out
>
> s/out/output/g ?
Yes, better & more consistent with the rest of the test scripts.
Also, what about squashing in this additiona change, to avoid a
useless fork (and a useless involution)?
-*-*-
diff --git a/tests/subobj9.test b/tests/subobj9.test
index 10ef4af..2045d58 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -65,7 +65,7 @@ $AUTOMAKE -a
./configure || Exit 77
# Opportunistically check that --tag=CXX is used when supported.
-if test -n "`./libtool --help | grep tag=TAG`"; then
+if ./libtool --help | grep tag=TAG; then
$MAKE print >stdout || { cat stdout; Exit 1; }
cat stdout
grep 'BEG1: .*--tag=CXX.*--mode=compile.* :1END' stdout
-*-*-
Thanks,
Stefano