Merge branch 'master' into testsuite-work

diff --cc ChangeLog
index 6b43628db90187624c9c39d50f37bb1a95222802,046ecffc6d7b0e1600403c445a32a64397170dbc..c629fe0290e1f06c31d4104856a4375c30ea6636
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,70 -1,11 +1,78 @@@
+ 2011-05-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix self check spurious failure with older bash versions
+       * tests/self-check-cleanup.test: Add trailing `:' to the test code
+       passed to $SHELL, otherwise older versions of bash (at least 2.05
+       and 3.2.39) fail to correctly remove the temporary directory in
+       the exit trap.
+ 
 +2011-05-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: add sanity check to 'self-check-cleanup.test'
 +      * tests/self-check-cleanup.test: Check that the "hacked" file
 +      `defs-static' used by the test differs from the "vanilla" one
 +      in builddir.  This also offers a little more debugging output.
 +
 +2011-05-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: display reasons for skips to the console
 +      * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Open file descriptor
 +      `9' to the original stderr; define `stderr_fileno_' to `9', and
 +      export it.
 +      * tests/self-check-report.test: Prevent new spurious failures by
 +      removing from the environment any definition of `stderr_fileno_'.
 +
 +2011-05-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: use `skip_' for skipping of tests
 +      * tests/defs: Use the `skip_' subroutine for test skipping.  Also
 +      give sometimes more detailed messages about the reasons for the
 +      skipping.
 +      * tests/canon7.test: Likewise.
 +      * tests/color.test: Likewise.
 +      * tests/color2.test: Likewise.
 +      * tests/compile2.test: Likewise.
 +      * tests/dejagnu7.test: Likewise.
 +      * tests/depcomp6.test: Likewise.
 +      * tests/depcomp9.test: Likewise.
 +      * tests/depcomp10.test: Likewise.
 +      * tests/distlinks.test: Likewise.
 +      * tests/distlinksbrk.test: Likewise.
 +      * tests/fn99.test: Likewise.
 +      * tests/fn99subdir.test: Likewise.
 +      * tests/forcemiss2.test: Likewise.
 +      * tests/fort5.test: Likewise.
 +      * tests/gettext3.test: Likewise.
 +      * tests/install2.test: Likewise.
 +      * tests/instfail-info.test: Likewise.
 +      * tests/instfail-java.test: Likewise.
 +      * tests/instfail-libtool.test: Likewise.
 +      * tests/instfail.test: Likewise.
 +      * tests/instmany-mans.test: Likewise.
 +      * tests/instmany-python.test: Likewise.
 +      * tests/instmany.test: Likewise.
 +      * tests/instsh3.test: Likewise.
 +      * tests/ltinit.test: Likewise.
 +      * tests/makej2.test: Likewise.
 +      * tests/mdate6.test: Likewise.
 +      * tests/mkinst3.test: Likewise.
 +      * tests/parallel-tests3.test: Likewise.
 +      * tests/parallel-tests-reset-term.test: Likewise.
 +      * tests/parallel-tests-unreadable-log.test: Likewise,
 +      * tests/python-virtualenv.test: Likewise.
 +      * tests/remake-gnulib-remove-header.test: Likewise.
 +      * tests/subobj9.test: Likewise.
 +      * tests/symlink2.test: Likewise.
 +      * tests/tar.test: Likewise.
 +      * tests/tar2.test: Likewise.
 +      * tests/txinfo26.test: Likewise.
 +      * tests/vala2.test: Likewise.
 +      * tests/vala3.test: Likewise.
 +      * tests/vala5.test: Likewise.
 +      * tests/vtexi4.test: Likewise.
 +      * tests/instdir-texi.test: Likewise.
 +      * tests/txinfo21.test: Likewise.
 +
  2011-04-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        testsuite: more environment sanitization

diff --cc tests/self-check-cleanup.test
Simple merge