Merge branch 'master' into testsuite-work

diff --cc ChangeLog
index c57e2c5984292de58eb7b2de9ad948fd11014f28,a5434ea48a3ff6c0747de13d75b102b6c7f6d5e9..058bd679a0172f8c3a6596e4033e683056018817
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,69 -1,13 +1,79 @@@
+ 2011-06-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix typo-related error in auxdir2.test
+       * tests/auxdir2.test (configure.in):  Close m4 quoting in the
+       argument to AC_CONFIG_AUX_DIR.  Without this, aclocal fails with
+       "ERROR: end of file in string".  This problem hasn't been exposed
+       by the testsuite before because this test is in XFAIL_TESTS, so
+       its failure went unnoticed, even if it was due to a wrong cause.
+       Bug introduced in commit v1.11-249-g49ac3de.
+ 
 +2011-06-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      self tests: check that `$me' can be overridden
 +      * tests/self-check-me.test: Check that `$me' can be overridden
 +      before sourcing ./defs, with or without sourcing ./defs-static
 +      beforehand, and that this override is honored.  Update heading
 +      comments.
 +
 +2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      self tests: fix another spurious failure
 +      Our ad-hoc usage of `tests/defs' in the testsuite's self tests
 +      stopped working properly when we made the test scripts re-execute
 +      themselves with the configure-time $SHELL.  Fix this.
 +      Fixes a regression introduced by commit 'v1.11-874-g1321be7'.
 +      * tests/self-check-exit.test: Export `AM_TESTS_REEXEC' to "no"
 +      before running the self tests.  This fixes a spurious failure
 +      present only when the test was run by hand.
 +
 +2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      silent-rules tests: fix spurious failures with Sun Studio C++
 +      * tests/silentcxx.test: The C++ compiler from Sun Studio is named
 +      `CC'.  Account for this in our grepping checks on the make output.
 +      Since we are at it, throw in a couple of improvements to comments
 +      and formatting.
 +      * tests/silent-many-generic.test: The C++ compiler from Sun Studio
 +      is named `CC', and this can cause spurious failures in our grepping
 +      of the make output.  Work around this by using a wrapper script
 +      around the C++ compiler (generated on the fly), since filtering the
 +      make output proved to be too fragile.
 +
 +2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure in backcompat2.test on NetBSD
 +      * tests/backcompat2.test: Add trailing `:' in the body of a `for'
 +      loop, in case the last command there might have an exit status
 +      different 0.  This work around `set -e' issues in some BSD shells,
 +      e.g., NetBSD /bin/ksh.
 +
 +2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure in autohdr3.test
 +      * tests/autohder3.test (Makefile.am): Let `test' depend on `all',
 +      so that config.h header is truly remade.
 +      Remove now useless call to `$MAKE' when non-GNU make is in use.
 +      Failure introduced by commit `v1.11-895-g5e62b96'.
 +
 +2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure of cond29.test on NetBSD
 +      * tests/cond29.test: Skip if we cannot safely limit the maximal
 +      size of used virtual memory to 20K.  This fixes a spurious failure
 +      on NetBSD.
 +      Bug introduced in commit `v1.11-885-g908d335'.
 +
 +2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      maintcheck: fix again few more failures
 +      * tests/cond29.test: To please the `sc_tests_Exit_not_exit'
 +      maintainer check, avoid using `sh -c "exit 0"' where a simple
 +      `sh -c :' will do.
 +      * tests/depmod-data.test: Use creative quoting to avoid
 +      spuriously triggering the `sc_tests_Exit_not_exit' maintainer
 +      check.
 +
  2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        maintcheck: fix some more failures