Merge branch 'fix-env-selfcheck'

diff --cc ChangeLog
index 541b6184816302c00a8b3e0a438f5ff0dc2d920f,7602870a74a3fbefa1bcf2eb3e62d31c5e510e67..d8e0a76fa4eee8af6161d140fbe02bc5c4f76301
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,34 -1,10 +1,41 @@@
+ 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