From 1d32ac13e60488ba363831d940990d9acbc62fe2 Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Tue, 7 Jun 2005 10:42:47 -0500
Subject: [PATCH] [svn-r10865] Purpose: Improvement

Description:
The actual stderr output was modified by the FILTER and was not
available for display if errors detected later.

Solution:
Copy the actual stderr to a temporary file and do filtering on that.

Platforms tested:
LANL Flash.

Misc. update:
---
 tools/h5diff/testh5diff.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index b415464245..9132336898 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -117,6 +117,7 @@ TOOLTEST() {
     expect="$srcdir/../testfiles/$1"
     actual="../testfiles/`basename $1 .txt`.out"
     actual_err="../testfiles/`basename $1 .txt`.err"
+    tmp_err=${actual_err}-tmp
     shift
     if test -n "$pmode"; then
 	RUNCMD=$RUNPARALLEL
@@ -139,8 +140,10 @@ TOOLTEST() {
 	    eval $RUNCMD $H5DIFF_BIN "$@"
 	fi
     ) >$actual 2>$actual_err
-    STDERR_FILTER $actual_err
-    cat $actual_err >> $actual
+    # save actual_err in case it is needed later.
+    cp $actual_err $tmp_err
+    STDERR_FILTER $tmp_err
+    cat $tmp_err >> $actual
 
     if $CMP $expect $actual; then
 	echo " PASSED"
@@ -169,13 +172,15 @@ TOOLTEST() {
 		sed 's/^/    /' < $actual 
 		echo "====The part that is actual stderr ($actual_err)"
 		sed 's/^/    /' < $actual_err 
+		echo "====End of actual stderr ($actual_err)"
+		echo ""
 	    fi
 	fi
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $actual $actual_err $actual_sorted $expect_sorted
+	rm -f $actual $actual_err $actual_sorted $tmp_err $expect_sorted
     fi
 }