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

[svn-r10029] Purpose:

Browse Source 
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:
This commit is contained in:
Albert Cheng 2005-02-17 11:14:20 -05:00
parent 1acd4485b8
commit 4d64b08030
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/h5diff/testh5diff.sh
View File

@ -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