Merge branch 'am-tests-environment-fix-merge'

diff --cc ChangeLog
index 67bdf6f,a36efe5..63a82fe
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,84 -1,11 +1,92 @@@
  2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       tests: fix spurious failure (non-renamed AM_TESTS_SETUP usage)
+       * tests/parallel-tests-reset-term.test: Use AM_TESTS_ENVIRONMENT
+       instead of AM_TESTS_SETUP (which has been removed in commit
+       v1.11-349-g12f48fa).
+       Fix spurious failure introduced by merge `v1.11-781-gfeed175'.
+ 
++2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      tests: fix spurious failure in a test on TESTS (VPATH-related)
 +      * check-tests-in-builddir.test: When not using the parallel-tests
 +      option, do not check that VPATH components are not present in the
 +      displayed test name, since the simple-tests driver do not try to
 +      strip them.
 +
 +2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failure in self-check-env-sanitize.test
 +      * tests/self-check-env-sanitize.test: Open file descriptor `5'
 +      to stdout.
 +      Fix spurious failure introduced by merge `v1.11-788-g3b0c8d5'.
 +
 +2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test: self check subroutines for skipping/failing of tests
 +      * tests/self-check-report.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +2011-04-23  Jim Meyering  <meyering@redhat.com>
 +          Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: new subroutines for test skipping/failing
 +      * tests/defs.in (Exit): Move definition of this function earlier.
 +      (warn_, skip_, fail_, framework_failure_): New functions, inspired
 +      to the homonyms in gnulib's tests/init.sh.
 +      ($stderr_fileno_): New global variable, used by the new functions
 +      above.
 +      * tests/README: Updated.
 +      From a suggestion by Ralf Wildenhues.
 +
 +2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix typo (copy & paste blunder) in heading comment
 +      * tests/maintclean-vpath.test: Correctly refer to the sister test
 +      as `maintclean.test', not as `maintclean-vpath.test'.
 +
 +2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: remove redundant test `mclean.test'
 +      * tests/mclean.test: Remove, it's a weak grepping test completely
 +      superseded by the much more complete `maintclean.test'.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +2011-04-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      testsuite: more environment sanitization
 +      * tests/defs.in: Sanity check: abort if any of `parallel_tests'
 +      or `required' is in the environment.
 +      ($sed_unindent_prog): Initialize to empty, to avoid interferences
 +      from the environment.
 +      * tests/self-check-me-in-env.test: Renamed to ...
 +      * tests/self-check-env-sanitize.test: ... this, and extended.
 +      * tests/Makefile.am (TESTS): Update.
 +      (TESTS_ENVIRONMENT): Unset variables `parallel_tests' and
 +      `required'.  Adjust comments.
 +
 +2011-04-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: in self-checks, use $SHELL, not /bin/sh
 +      * tests/self-check-me-in-env.test: Include `./defs-static' to get
 +      the definition of `$SHELL'.  Use `$SHELL' instead of `/bin/sh' to
 +      execute the tests.
 +
 +2011-04-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: prefer AM_TESTS_ENVIRONMENT to TESTS_ENVIRONMENT
 +      * tests/Makefile.am (TESTS_ENVIRONMENT): Renamed to ...
 +      (AM_TESTS_ENVIRONMENT): ... this.
 +
 +2011-04-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: don't allow `$me' to be overridden from the environment
 +      * tests/defs.in: Sanity check: abort if $me is in the environment.
 +      * tests/self-check-me-in-env.test: New test.
 +      * tests/Makefile.am (TESTS_ENVIRONMENT): Unset variable `me'.
 +      (TESTS): Update.
 +      Suggestion by Ralf Wildenhues.
 +
  2011-04-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        check: rename AM_TESTS_SETUP -> AM_TESTS_ENVIRONMENT