summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2005-06-07 15:42:47 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2005-06-07 15:42:47 (GMT)
commit1d32ac13e60488ba363831d940990d9acbc62fe2 (patch)
tree8c00e7d63017fc75defc80d58a9dcb9e045a5a94 /tools
parent0cabc1bc524b3a204a97679f22e58b858e0da844 (diff)
downloadhdf5-1d32ac13e60488ba363831d940990d9acbc62fe2.zip
hdf5-1d32ac13e60488ba363831d940990d9acbc62fe2.tar.gz
hdf5-1d32ac13e60488ba363831d940990d9acbc62fe2.tar.bz2
[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:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/h5diff/testh5diff.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index b415464..9132336 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
}