diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-12 15:29:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-12 15:29:10 (GMT) |
| commit | 8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4 (patch) | |
| tree | 0917ab5bc2b5666bffc7209b85b5b571b806bb03 /tools/test/h5ls/testh5ls.sh.in | |
| parent | 1be974ff963e2e538090bb3e65ba66feb93d5c68 (diff) | |
| parent | 139a12d13cda046fd3cd64a4f097eb3485f50173 (diff) | |
| download | hdf5-8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4.zip hdf5-8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4.tar.gz hdf5-8822bc3c4128ba4e134dfbb4e1ed2d942dad4cb4.tar.bz2 | |
Merge pull request #1349 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '139a12d13cda046fd3cd64a4f097eb3485f50173':
HDFFV-10632 correct number
HDFFV-10632 stder/stdout change note
Add stamp files for generated files
HDFFV-10632 update autotools test scripts to match cmake
HDFFV=10632 test cleanup
Fix special macro stdout as empty
Need nonexistent file to skip stdout compare
HDFFV-10632 - split stderr and stdout in cmake
Diffstat (limited to 'tools/test/h5ls/testh5ls.sh.in')
| -rw-r--r-- | tools/test/h5ls/testh5ls.sh.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in index 8c6551b..353f1bb 100644 --- a/tools/test/h5ls/testh5ls.sh.in +++ b/tools/test/h5ls/testh5ls.sh.in @@ -53,6 +53,7 @@ SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles" SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles" SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles" SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles" +SRC_H5LS_ERRFILES="$SRC_TOOLS/test/h5ls/errfiles" TESTDIR=./testfiles test -d $TESTDIR || mkdir $TESTDIR @@ -93,6 +94,12 @@ $SRC_H5LS_TESTFILES/tvldtypes1.h5 $SRC_H5LS_TESTFILES/tdset_idx.h5 " +LIST_ERROR_TEST_FILES=" +$SRC_H5LS_ERRFILES/nosuchfile.err +$SRC_H5LS_ERRFILES/textlinksrc-nodangle-1.err +$SRC_H5LS_ERRFILES/tgroup-1.err +" + LIST_OTHER_TEST_FILES=" $SRC_H5LS_TESTFILES/help-1.ls $SRC_H5LS_TESTFILES/help-2.ls @@ -228,8 +235,9 @@ TESTING() { # $2 and on -- argument for the h5ls tool TOOLTEST() { expect="$TESTDIR/$1" + expect_err="$TESTDIR/`basename $1 .ls`.err" actual="$TESTDIR/`basename $1 .ls`.out" - actual_err="$TESTDIR/`basename $1 .ls`.err" + actual_err="$TESTDIR/`basename $1 .ls`.out.err" actual_sav=${actual}-sav actual_err_sav=${actual_err}-sav shift @@ -251,7 +259,6 @@ TOOLTEST() { STDOUT_FILTER $actual cp $actual_err $actual_err_sav STDERR_FILTER $actual_err - cat $actual_err >> $actual if [ $h5haveexitcode = 'yes' -a $exitcode -ne $retvalexpect ]; then echo "*FAILED*" nerrors="`expr $nerrors + 1`" |