A minor cleanup patch for the testsuite. Should cause no semantic change whatsoever.
Regards, Stefano -*-*-*- 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). * subobj10.test: Likewise. * subobj9.test: Likewise. * lex3.test (Makefile.am): Similarly, remove useless use of `foreign' option in AUTOMAKE_OPTIONS. * lex5.test: Likewise. * pr279.test: Likewise. * pr279-2.test: Likewise. * specflg3.test: Likewise. * target-cflags.test: Likewise. --- ChangeLog | 16 ++++++++++++++++ tests/lex3.test | 2 -- tests/lex5.test | 2 +- tests/multlib.test | 4 ++-- tests/pr279-2.test | 2 -- tests/pr279.test | 2 -- tests/specflg3.test | 1 - tests/subobj10.test | 2 +- tests/subobj9.test | 2 +- tests/target-cflags.test | 2 +- 10 files changed, 22 insertions(+), 13 deletions(-)
From 9387d00bf2a609507aa530147f199113ced112da Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Fri, 25 Jun 2010 17:19:44 +0200 Subject: [PATCH] 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). * subobj10.test: Likewise. * subobj9.test: Likewise. * lex3.test (Makefile.am): Similarly, remove useless use of `foreign' option in AUTOMAKE_OPTIONS. * lex5.test: Likewise. * pr279.test: Likewise. * pr279-2.test: Likewise. * specflg3.test: Likewise. * target-cflags.test: Likewise. --- ChangeLog | 16 ++++++++++++++++ tests/lex3.test | 2 -- tests/lex5.test | 2 +- tests/multlib.test | 4 ++-- tests/pr279-2.test | 2 -- tests/pr279.test | 2 -- tests/specflg3.test | 1 - tests/subobj10.test | 2 +- tests/subobj9.test | 2 +- tests/target-cflags.test | 2 +- 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 863d271..b4fb522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2010-06-25 Stefano Lattarini <stefano.lattar...@gmail.com> + + 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). + * subobj10.test: Likewise. + * subobj9.test: Likewise. + * lex3.test (Makefile.am): Similarly, remove useless use of + `foreign' option in AUTOMAKE_OPTIONS. + * lex5.test: Likewise. + * pr279.test: Likewise. + * pr279-2.test: Likewise. + * specflg3.test: Likewise. + * target-cflags.test: Likewise. + 2010-06-24 Stefano Lattarini <stefano.lattar...@gmail.com> Fix bugs in test script silent5.test. diff --git a/tests/lex3.test b/tests/lex3.test index 59146c7..5efba27 100755 --- a/tests/lex3.test +++ b/tests/lex3.test @@ -38,9 +38,7 @@ AC_OUTPUT(Makefile) END cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = foreign LDADD = @LEXLIB@ - noinst_PROGRAMS = foo foo_SOURCES = foo.l END diff --git a/tests/lex5.test b/tests/lex5.test index edbdf9d..74f53ec 100755 --- a/tests/lex5.test +++ b/tests/lex5.test @@ -33,7 +33,7 @@ AC_OUTPUT END cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = foreign subdir-objects +AUTOMAKE_OPTIONS = subdir-objects LDADD = @LEXLIB@ bin_PROGRAMS = foo/foo diff --git a/tests/multlib.test b/tests/multlib.test index 65b3fd4..80a63ff 100755 --- a/tests/multlib.test +++ b/tests/multlib.test @@ -64,7 +64,7 @@ AC_CONFIG_SRCDIR(foo.c) # Apparently it doesn't work to have auxdir=.. when # multilib uses symlinked trees. AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE(foreign) +AM_INIT_AUTOMAKE AC_PROG_CC AC_PROG_RANLIB AM_ENABLE_MULTILIB(Makefile,[..]) @@ -87,7 +87,7 @@ AC_INIT(libbar, 0.1, nob...@localhost) # Apparently it doesn't work to have auxdir=.. when # multilib uses symlinked trees. AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE(foreign) +AM_INIT_AUTOMAKE AC_PROG_CC AC_PROG_RANLIB AM_ENABLE_MULTILIB(Makefile,[..]) diff --git a/tests/pr279-2.test b/tests/pr279-2.test index 1d1e675..f2defc6 100755 --- a/tests/pr279-2.test +++ b/tests/pr279-2.test @@ -28,8 +28,6 @@ AC_OUTPUT END cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = foreign - if FOOTEST foo_LDADD = zardoz else diff --git a/tests/pr279.test b/tests/pr279.test index b7ec641..5668a3c 100755 --- a/tests/pr279.test +++ b/tests/pr279.test @@ -28,8 +28,6 @@ AC_OUTPUT END cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = foreign - if FOOTEST xtralib = else diff --git a/tests/specflg3.test b/tests/specflg3.test index 53793a1..92cc68b 100755 --- a/tests/specflg3.test +++ b/tests/specflg3.test @@ -27,7 +27,6 @@ AC_OUTPUT(Makefile) END cat > Makefile.am << 'END' -AUTOMAKE_OPTIONS = foreign bin_PROGRAMS = foo foo_SOURCES = foo.c foo_CFLAGS = -DFOO diff --git a/tests/subobj10.test b/tests/subobj10.test index c9c129d..07b05d9 100755 --- a/tests/subobj10.test +++ b/tests/subobj10.test @@ -23,7 +23,7 @@ set -e cat > configure.in << 'END' AC_INIT(x, 0, x) -AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_INIT_AUTOMAKE([subdir-objects]) AM_PROG_AS AC_PROG_RANLIB diff --git a/tests/subobj9.test b/tests/subobj9.test index 99fe6e8..9c628a8 100755 --- a/tests/subobj9.test +++ b/tests/subobj9.test @@ -21,7 +21,7 @@ required='libtoolize g++' cat > configure.in << 'END' AC_INIT(x, 0, x) -AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_INIT_AUTOMAKE([subdir-objects]) AC_PROG_CXX AM_PROG_LIBTOOL diff --git a/tests/target-cflags.test b/tests/target-cflags.test index d0f83f3..e59e1a8 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 = foreign no-dependencies +AUTOMAKE_OPTIONS = no-dependencies bin_PROGRAMS = foo bar foo_CFLAGS = -DFOO -- 1.6.5
