Merge branch 'master' into testsuite-work

diff --cc ChangeLog
index 24e2428,bfd90cd..2ad40b9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,117 -1,19 +1,131 @@@
  2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       tests: add forgotten test scripts to $(TESTS)
+       * tests/Makefile.am (TESTS): Added test scripts  man[678].test,
+       which have been present on the filesystem and in the repository,
+       but which had erroneously been left out from $(TESTS).
+ 
+ 2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: ensure verbose printing of captured make output
+       * tests/libtool7.test: Ensure verbose printing of captured
+       make output.
+       * tests/libtool9.test: Likewise.
+ 
+ 2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
 +      maintcheck: consistency of list of test scripts
 +      * CheckListOfTests.am: New file.
 +      (maintainer-check-list-of-tests): New target,
 +      check for consistency between list of tests defined in the
 +      including Makefile and list of tests on the filesystem.
 +      (clean-maintcheck-testslist-tmp): New rule, to clean up the
 +      temporary files that might be left around by the rules associated
 +      with the previous target.
 +      (clean-local): Depend on it.
 +      * lib/Automake/tests/Makefile.am: Include `CheckListOfTests.am'.
 +      (maintainer-check): Added dependency from the new target
 +      `maintainer-check-list-of-tests'.
 +      * tests/Makefile.am: Likewise.  Also ...
 +      (checked_test_extensions): Define to `.test'.
 +      (expected_test_list): Define properly.
 +      * Makefile.am (maintainer-check-list-of-test): New target,
 +      calling recursively into `tests/' and `lib/Automake/tests/',
 +      using ...
 +      (TEST_SUBDIRS): ... this new variable.
 +
 +2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: drop useless requirements of gcc (plus testsuite tweakings)
 +      * tests/libobj14.test ($required): Remove 'gcc', as we never run
 +      the C compiler.
 +      * tests/targetclash.test: Likewise.
 +      * tests/ansi6.test ($required): Remove 'gcc', as any working
 +      C compiler should be enough.
 +      * tests/ansi7.test: Likewise.
 +      * tests/ansi9.test: Likewise.
 +      * tests/ansi10.test: Likewise.
 +      * tests/lex5.test: Likewise.
 +      * tests/lexvpath.test: Likewise.
 +      * tests/mmodely.test: Likewise.
 +      * tests/pr204.test: Likewise.
 +      * tests/pr300-lib.test: Likewise.
 +      * tests/pr300-prog.test: Likewise.
 +      * tests/primary3.test: Likewise.
 +      * tests/specflg7.test: Likewise.
 +      * tests/specflg8.test: Likewise.
 +      * tests/subdir5.test: Likewise.
 +      * tests/subdir8.test: Likewise.
 +      * tests/subobj6.test: Likewise.
 +      * tests/subst3.test: Likewise.
 +      * tests/substre2.test: Likewise.
 +      * tests/yacc6.test: Likewise.
 +      * tests/yacc8.test: Likewise.
 +      * tests/depcomp2.test: Likewise.  Also, avoid clobbering user-set
 +      CFLAGS.
 +      * tests/lex3.test: Likewise.
 +      * tests/ansi3.test: Likewise.  Also, avoid 'CC=gcc' in configure.
 +      * tests/ansi3b.test: Likewise.
 +      * tests/ansi5.test: Likewise.
 +      * tests/autohdr4.test ($required): Remove 'gcc', as any working
 +      C compiler should be enough.
 +      Also, do not reject slow dependency extractors (which we might
 +      be forced to use now that $CC is not necessarily gcc anymore).
 +      * tests/cond16.test ($required): Remove 'gcc', as any working
 +      C compiler should be enough.
 +      Since we are at it, throw in few minor tweakings (mostly cosmetic,
 +      stylistic, or consistency-related).
 +      * tests/cond18.test: Likewise.
 +      * tests/cond35.test: Likewise.
 +      * tests/gnits2.test: Likewise.
 +      * tests/libtool3.test: Likewise.
 +      * tests/libtool7.test: Likewise.
 +      * tests/libtool9.test: Likewise.
 +      * tests/ltcond.test: Likewise.
 +      * tests/ltcond2.test: Likewise.
 +      * tests/ltconv.test: Likewise.
 +      * tests/ltlibsrc.test: Likewise.
 +      * tests/nobase.test: Likewise.
 +      * tests/nobase-libtool.test: Likewise.
 +      * tests/pr220.test: Likewise.
 +      * tests/pr224.test: Likewise.
 +      * tests/pr300-ltlib.test: Likewise.
 +      * tests/pr401.test: Likewise.
 +      * tests/pr401b.test: Likewise.
 +      * tests/pr401c.test: Likewise.
 +      * tests/subpkg.test: Likewise.
 +      * tests/target-cflags.test: Likewise.
 +      * tests/transform.test: Likewise.
 +      * tests/yacc4.test: Likewise.
 +      * tests/cond19.test: Likewise.  Also, avoid clobbering user-set
 +      CFLAGS.
 +      * tests/cond4.test: Likewise.
 +      * tests/depend2.test: Likewise.
 +      * tests/pr87.test: Likewise.
 +      * tests/subobj3.test: Likewise.
 +      * tests/substref.test: Likewise.
 +
 +2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: increase coverage w.r.t. GNU make
 +      * tests/defs (GNUmake): Instead of just skipping the tests
 +      requiring GNU make if $MAKE is not GNU make, try to look for
 +      it and, if found, redefine $MAKE accordingly.  This will help
 +      to transparently increase coverage on non-GNU systems which
 +      have GNU make available in PATH.
 +
 +2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: improve few inter-tests references
 +      * tests/acloca22.test: Improve and extend the heading comments.
 +      Add reference to related tests 'remake-deleted-m4-file.test' and
 +      'remake-renamed-m4-macro-and-file.test'.  Since we are at it,
 +      add trailing `:' command, and few blank lines for readability.
 +      * tests/remake-renamed-m4-macro-and-file.test: In the heading
 +      comments, add reference to the related test 'acloca22.test'.
 +
 +2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
        tests: fix spurious failure in 'color2.test'
        * tests/color2.test: If $MAKE contains command-line arguments (as
        in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/libtool7.test
index 39d64b0,9700628..ad8e2ec
--- 1/tests/libtool7.test
--- 2/tests/libtool7.test
+++ b/tests/libtool7.test
@@@ -91,8 -99,9 +97,11 @@@ cat outpu
  grep 'silent.*silent.*prg' output
  grep 'silent.*silent.*libmod1' output
  
- env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1
+ env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 || {
+   cat output
+   Exit 1
+ }
  cat output
  grep 'silent.*silent.*libmod1' output
 +
 +:

diff --cc tests/libtool9.test
Simple merge