mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r21457] Problem:

Browse Source 
Function TOOLTEST_OUTPUT does not filter the extra system messages sent to
stdout or stderr, thus causing output mismatched with expected output.

Solution:
Added STDOUT_FILTER and STDERR_FILTER to filter them out.

Tested:
Tested LLNL uDawn (Blue-Gene cluster), for serial mode only.
This commit is contained in:
Albert Cheng 2011-10-04 03:16:00 -05:00
parent 9d793e7e5e
commit 082a3ce442
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/h5jam/testh5jam.sh.in
View File

@ -86,6 +86,9 @@ $SRC_H5JAM_TESTFILES/h5unjam-help.txt
$SRC_H5JAM_TESTFILES/h5jam-ub-nohdf5.txt
"
# Source in the output filter function definitions.
. $srcdir/../../bin/output_filter.sh
#
# copy test files and expected output files from source dirs to test dir
#
@ -462,6 +465,8 @@ TOOLTEST_OUTPUT() {
expect="$TESTDIR/$1"
actual="$TESTDIR/`basename $1 .ls`.out"
actual_err="$TESTDIR/`basename $1 .ls`.err"
actual_sav=${actual}-sav
actual_err_sav=${actual_err}-sav
shift
retvalexpect=$1
shift
@ -472,6 +477,11 @@ TOOLTEST_OUTPUT() {
$TOOLCMD "$@"
) >$actual 2>$actual_err
# save actual and actual_err in case they are needed later.
cp $actual $actual_sav
STDOUT_FILTER $actual
cp $actual_err $actual_err_sav
STDERR_FILTER $actual_err
# combine stderr to stdout for output compare
cat $actual_err >> $actual