diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-06 18:48:39 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-06 18:48:39 (GMT) |
| commit | 11b4c1f3afde1016de8c75e423054854bed62001 (patch) | |
| tree | dfee509ed981b06530fe26ee67c56620fe963fbe /tools/test/h5copy/testh5copy.sh.in | |
| parent | 2998dbfc709f7746831e71dfb24145bd62f4f4bb (diff) | |
| download | hdf5-11b4c1f3afde1016de8c75e423054854bed62001.zip hdf5-11b4c1f3afde1016de8c75e423054854bed62001.tar.gz hdf5-11b4c1f3afde1016de8c75e423054854bed62001.tar.bz2 | |
HDFFV-10632 update autotools test scripts to match cmake
Diffstat (limited to 'tools/test/h5copy/testh5copy.sh.in')
| -rw-r--r-- | tools/test/h5copy/testh5copy.sh.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in index 203bfef..50758b5 100644 --- a/tools/test/h5copy/testh5copy.sh.in +++ b/tools/test/h5copy/testh5copy.sh.in @@ -60,6 +60,7 @@ $SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5 # List of expect files that will be copied over to local test dir LIST_OTHER_TEST_FILES=" $SRC_H5COPY_TESTFILES/h5copy_misc1.out +$SRC_H5COPY_TESTFILES/h5copy_misc1.err " H5COPY=../../src/h5copy/h5copy # The tool name @@ -396,6 +397,7 @@ CMP_OUTPUT() TOOLTEST_FAIL() { expectout="$TESTDIR/$1" + expecterr="$TESTDIR/`basename $1 .out`.err" actualout="$TESTDIR/$1.actualout" actualerr="$TESTDIR/$1.actualerr" actualout_sav=${actualout}-sav @@ -426,10 +428,7 @@ TOOLTEST_FAIL() echo " PASSED" # Verifying output text from h5copy if [ "$expectout" != "SKIP" ]; then - # combine stderr to stdout to compare the output at once. - # We may seperate stdout and stderr later. - cat $actualerr >> $actualout - CMP_OUTPUT $expectout $actualout + CMP_OUTPUT $expecterr $actualerr fi else echo "*FAILED*" |