diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-04 17:48:15 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-04 17:48:15 (GMT) |
| commit | 1379878b7a7785d3f0c5fe97badcb7997bb2ce20 (patch) | |
| tree | 94aef53e7078c3011475c560012380d59322feba /tools/test/h5copy/testh5copy.sh.in | |
| parent | f891c38c6e724e9032a534512618b9650be76377 (diff) | |
| parent | 44895c80acfa3f57151c7811f710755d79a7f2cf (diff) | |
| download | hdf5-1379878b7a7785d3f0c5fe97badcb7997bb2ce20.zip hdf5-1379878b7a7785d3f0c5fe97badcb7997bb2ce20.tar.gz hdf5-1379878b7a7785d3f0c5fe97badcb7997bb2ce20.tar.bz2 | |
Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_1_10_bmr into hdf5_1_10
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*" |