[FYI] {master} tests: fix spurious failure in self-check-env-sanitize.test

[Stefano Lattarini]

I've applied the attached patch to fix a spurious failure in
master, caused by a botched merge.

Sorry for the noise,
  Stefano 

From 5ae564e399bec2cd095ecf0adafef168b83b0cc1 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sun, 24 Apr 2011 00:08:11 +0200
Subject: [PATCH] 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'.
---
 ChangeLog                          |    7 +++++++
 tests/self-check-env-sanitize.test |    1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8821b0a..7602870 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-22  Stefano Lattarini  <address@hidden>
 
        testsuite: more environment sanitization
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
-- 
1.7.2.3