[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-796-g96048c0

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=96048c03b654317cc00fbd174c5095ab68ed6a62

The branch, master has been updated
       via  96048c03b654317cc00fbd174c5095ab68ed6a62 (commit)
       via  5ae564e399bec2cd095ecf0adafef168b83b0cc1 (commit)
      from  13b8cba6f99cb3cf9c93065832760389a7962963 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 96048c03b654317cc00fbd174c5095ab68ed6a62
Merge: 13b8cba 5ae564e
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 24 00:09:46 2011 +0200

    Merge branch 'fix-env-selfcheck'

commit 5ae564e399bec2cd095ecf0adafef168b83b0cc1
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 24 00:08:11 2011 +0200

    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'.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |    7 +++++++
 tests/self-check-env-sanitize.test |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 541b618..d8e0a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-24  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        test: self check subroutines for skipping/failing of tests
diff --git a/tests/self-check-env-sanitize.test 
b/tests/self-check-env-sanitize.test
index a8aaec0..3a07c91 100755
--- a/tests/self-check-env-sanitize.test
+++ b/tests/self-check-env-sanitize.test
@@ -21,6 +21,7 @@
 . ./defs-static || exit 1
 
 set -x
+exec 5>&1
 
 for var in me parallel_tests required; do
   env "$var=foo" $SHELL -c '. ./defs' foo.test && exit 1


hooks/post-receive
-- 
GNU Automake