summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2005-02-17 16:14:20 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2005-02-17 16:14:20 (GMT)
commit4d64b08030c57b74a9b5cd49ef57f6b929e7da55 (patch)
tree38112a0b5269ce49afc3b4e53c551b89b8ada897
parent1acd4485b8a4fa5eb14d2c556cf0e62227258461 (diff)
downloadhdf5-4d64b08030c57b74a9b5cd49ef57f6b929e7da55.zip
hdf5-4d64b08030c57b74a9b5cd49ef57f6b929e7da55.tar.gz
hdf5-4d64b08030c57b74a9b5cd49ef57f6b929e7da55.tar.bz2
[svn-r10029] Purpose:
bug fix. Description: When MPE library is used, it prints two extra message lines that interfere with the expected output. Solution: Filter out those two lines of text from stderr. Also added a provision to print the whole generated output when failure is detected. Platforms tested: Tested in copper, serial, parallel and parallel with MPE. Misc. update:
-rwxr-xr-xtools/h5diff/testh5diff.sh20
1 files changed, 17 insertions, 3 deletions
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 31de7db..e76a1b0 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -106,13 +106,23 @@ TOOLTEST() {
eval $RUNCMD $H5DIFF_BIN "$@"
fi
) >$actual 2>$actual_err
- cat $actual_err >> $actual
+ # In parallel mode and if MPE library is used, it prints the following
+ # two message lines.
+ # Writing logfile.
+ # Finished writing logfile.
+ # They interfere with the expected output. Filter them out.
+ if test -n "$pmode"; then
+ sed -e '/^Writing logfile./d' -e '/^Finished writing logfile./d' \
+ < $actual_err >> $actual
+ else
+ cat $actual_err >> $actual
+ fi
if $CMP $expect $actual; then
echo " PASSED"
elif test -z "$pmode"; then
echo "*FAILED*"
- echo " Expected result (*.txt) differs from actual result (*.out)"
+ echo " Expected result ($expect) differs from actual result ($actual)"
nerrors="`expr $nerrors + 1`"
test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /'
else
@@ -129,8 +139,12 @@ TOOLTEST() {
echo "*FAILED*"
nerrors="`expr $nerrors + 1`"
if test yes = "$verbose"; then
- echo " Expected result (*.txt) differs from actual result (*.out)"
+ echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
$DIFF $expect_sorted $actual_sorted |sed 's/^/ /'
+ echo "====The actual result ($actual)"
+ sed 's/^/ /' < $actual
+ echo "====The part that is actual stderr ($actual_err)"
+ sed 's/^/ /' < $actual_err
fi
fi
fi