mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r10865] Purpose:

Browse Source 
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:
This commit is contained in:
Albert Cheng 2005-06-07 10:42:47 -05:00
parent 0cabc1bc52
commit 1d32ac13e6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/h5diff/testh5diff.sh
View File

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