Re: [PATCH] Tests: remove useless repetitions of `foreign' automake option.

[Stefano Lattarini]

At Saturday 26 June 2010, Ralf Wildenhues wrote:
> Hi Stefano,
> 
> * Stefano Lattarini wrote on Fri, Jun 25, 2010 at 05:22:19PM CEST:
> > A minor cleanup patch for the testsuite.  Should cause no
> > semantic change whatsoever.
> 
> Yes, but ...
> 
> > Tests: remove useless repetitions of `foreign' automake option.
> >
> > * multlib.test (configure.in): Remove useless use of `foreign'
> > option in AM_INIT_AUTOMAKE (the `--foreign' option is already
> > in $AUTOMAKE by default, so no point in repeating it).
> 
> ... except maybe for documentation purposes.  Are any of the tests
> truly for foreign style packages only,
I don't think so.
> or is that always just used
> in order to save on generating the GNU-specific files?
This should be the real reason, yes (and is also the reason why
--foreign is appended to $AUTOMAKE in tests/defs, BTW).

Just to be sure, I first added `gnu' to AUTOMAKE_OPTIONS in every
Makefile.am generated by those modified tests, which subsequently
all failed.  Then I made sure that the files required by gnu mode were
created by each test before running automake:
  $ sed -i 
's/.*\$AUTOMAKE.*/:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING\n&/'
All the tests passed again.

So I think the patch is safe.  If you want to check directly, I have
attached the temporary patches used in the described testing.

Regards,
   Stefano

From b3c86122986cd076f1b6bc286d50c55698c10b7b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sat, 26 Jun 2010 13:27:32 +0200
Subject: [PATCH 1/2] no log

---
 tests/lex3.test          |    1 +
 tests/lex5.test          |    2 +-
 tests/multlib.test       |    3 +++
 tests/pr279-2.test       |    2 ++
 tests/pr279.test         |    2 ++
 tests/specflg3.test      |    1 +
 tests/subobj10.test      |    1 +
 tests/subobj9.test       |    1 +
 tests/target-cflags.test |    2 +-
 9 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/lex3.test b/tests/lex3.test
index 5efba27..f2c60d0 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -38,6 +38,7 @@ AC_OUTPUT(Makefile)
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
 LDADD             = @LEXLIB@
 noinst_PROGRAMS   = foo
 foo_SOURCES       = foo.l
diff --git a/tests/lex5.test b/tests/lex5.test
index 74f53ec..dcc849d 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -33,7 +33,7 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS  = subdir-objects
+AUTOMAKE_OPTIONS  = gnu subdir-objects
 LDADD             = @LEXLIB@
 
 bin_PROGRAMS    = foo/foo
diff --git a/tests/multlib.test b/tests/multlib.test
index 80a63ff..5140faa 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -48,6 +48,7 @@ chmod +x mycc
 PATH=`pwd`:$PATH
 
 cat >Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = gnu
 SUBDIRS = @subdirs@
 EXTRA_DIST = config-ml.in symlink-tree
 EOF
@@ -73,6 +74,7 @@ AC_OUTPUT
 END
 
 cat >libfoo/Makefile.am <<'END'
+AUTOMAKE_OPTIONS = gnu
 noinst_LIBRARIES = libfoo.a
 libfoo_a_SOURCES = foo.c
 END
@@ -96,6 +98,7 @@ AC_OUTPUT
 END
 
 cat >libbar/Makefile.am <<'END'
+AUTOMAKE_OPTIONS = gnu
 SUBDIRS = sub
 noinst_LIBRARIES = libbar.a
 libbar_a_SOURCES = bar.c
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index f2defc6..ad9a1bf 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -28,6 +28,8 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
+
 if FOOTEST
 foo_LDADD = zardoz
 else
diff --git a/tests/pr279.test b/tests/pr279.test
index 5668a3c..c5c592b 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -28,6 +28,8 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
+
 if FOOTEST
 xtralib =
 else
diff --git a/tests/specflg3.test b/tests/specflg3.test
index 92cc68b..31ecaba 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -27,6 +27,7 @@ AC_OUTPUT(Makefile)
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
 bin_PROGRAMS = foo
 foo_SOURCES = foo.c
 foo_CFLAGS = -DFOO
diff --git a/tests/subobj10.test b/tests/subobj10.test
index 07b05d9..4c9ad38 100755
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -33,6 +33,7 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
 noinst_LIBRARIES = libfoo.a libbar.a
 libfoo_a_SOURCES = src/a.s b.s
 libbar_a_SOURCES = src/c.s d.s
diff --git a/tests/subobj9.test b/tests/subobj9.test
index 9c628a8..e6539de 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -31,6 +31,7 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
 noinst_LTLIBRARIES = libfoo.la
 libfoo_la_SOURCES = src/foo.cc .//src/bar.cc  # the `.//' is meant.
 
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index e59e1a8..ad704b3 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -29,7 +29,7 @@ AC_OUTPUT(Makefile)
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS = gnu no-dependencies
 
 bin_PROGRAMS = foo bar
 foo_CFLAGS   = -DFOO
-- 
1.6.5

From c168f0cd1d8f34ffc8a3636ecaf394b99bb619f7 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sat, 26 Jun 2010 13:37:26 +0200
Subject: [PATCH 2/2] no log

---
 tests/lex3.test          |    1 +
 tests/lex5.test          |    2 ++
 tests/multlib.test       |    3 +++
 tests/pr279-2.test       |    1 +
 tests/pr279.test         |    1 +
 tests/specflg3.test      |    1 +
 tests/subobj10.test      |    1 +
 tests/subobj9.test       |    1 +
 tests/target-cflags.test |    1 +
 9 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/tests/lex3.test b/tests/lex3.test
index f2c60d0..e97e923 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -63,6 +63,7 @@ set -e
 
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE -a
 ./configure
 $MAKE
diff --git a/tests/lex5.test b/tests/lex5.test
index dcc849d..a757a27 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -61,6 +61,7 @@ set -e
 
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE -a
 
 mkdir sub
@@ -88,6 +89,7 @@ END
 # output will change, --no-force should have no effect).
 $sleep
 
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE -a --no-force
 test -f ./ylwrap
 
diff --git a/tests/multlib.test b/tests/multlib.test
index 5140faa..f1a8e73 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -115,14 +115,17 @@ cp "$testsrcdir/../lib/symlink-tree" .
 
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE --add-missing
 cd libfoo
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE --add-missing
 cd ../libbar
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE --add-missing
 cd ..
 
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index ad9a1bf..1c16f1f 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -40,6 +40,7 @@ bin_PROGRAMS = foo
 END
 
 $ACLOCAL || Exit 1
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE || Exit 1
 
 grep '@foo_DEPENDENCIES = zardoz' Makefile.in || Exit 1
diff --git a/tests/pr279.test b/tests/pr279.test
index c5c592b..48307aa 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -42,4 +42,5 @@ foo_DEPENDENCIES =
 END
 
 $ACLOCAL || Exit 1
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE
diff --git a/tests/specflg3.test b/tests/specflg3.test
index 31ecaba..c97e19e 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -36,6 +36,7 @@ END
 : > compile
 
 $ACLOCAL || Exit 1
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE || Exit 1
 
 $FGREP -e '-o foo-foo' Makefile.in || Exit 1
diff --git a/tests/subobj10.test b/tests/subobj10.test
index 4c9ad38..f98b6d2 100755
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -50,6 +50,7 @@ set -e
 
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE -a
 
 ./configure
diff --git a/tests/subobj9.test b/tests/subobj9.test
index e6539de..232bbd1 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -61,6 +61,7 @@ set -e
 libtoolize --force
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE -a
 
 # Skip this test on configure errors (e.g., broken C++ compilers).
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index ad704b3..dfb1333 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -57,6 +57,7 @@ set -e
 
 $ACLOCAL
 $AUTOCONF
+:>INSTALL;:>NEWS;:>README;:>AUTHORS;:>ChangeLog;:>COPYING
 $AUTOMAKE -a
 mkdir build
 
-- 
1.6.5