diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2013-11-19 23:00:19 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-11-19 23:00:19 (GMT) |
| commit | 9dfe3e854f023fb2351cdd014c1954297e9fd921 (patch) | |
| tree | fbe8d544de76a35a7b46b2733ebdae20f8007b33 /tools/h5ls | |
| parent | 612faec1aceceb595c77da52b092b7683581e776 (diff) | |
| download | hdf5-9dfe3e854f023fb2351cdd014c1954297e9fd921.zip hdf5-9dfe3e854f023fb2351cdd014c1954297e9fd921.tar.gz hdf5-9dfe3e854f023fb2351cdd014c1954297e9fd921.tar.bz2 | |
[svn-r24457] Bring revisions #24333 - #24432 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'tools/h5ls')
| -rw-r--r-- | tools/h5ls/testh5ls.sh.in | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tools/h5ls/testh5ls.sh.in b/tools/h5ls/testh5ls.sh.in index 1e3acc8..68b317c 100644 --- a/tools/h5ls/testh5ls.sh.in +++ b/tools/h5ls/testh5ls.sh.in @@ -24,6 +24,7 @@ EXIT_FAILURE=1 H5LS=h5ls # The tool name H5LS_BIN=`pwd`/$H5LS # The path of the tool binary +RM='rm -rf' CMP='cmp -s' DIFF='diff -c' CP='cp' @@ -191,6 +192,19 @@ COPY_TESTFILES_TO_TESTDIR() done } +CLEAN_TESTFILES_AND_TESTDIR() +{ + # skip rm if srcdir is same as destdir + # this occurs when build/test performed in source dir and + # make cp fail + SDIR=`$DIRNAME $tstfile` + INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'` + INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'` + if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then + $RM $TESTDIR + fi +} + # Print a line-line message left justified in a field of 70 characters # beginning with the word "Testing". TESTING() { @@ -409,6 +423,8 @@ fi # test for file with datasets that use Fixed Array chunk indices echo "***skip testing tdset_idx.h5" #TOOLTEST tdset_idx.ls 0 -w80 -d tdset_idx.h5 +# Clean up temporary files/directories +CLEAN_TESTFILES_AND_TESTDIR if test $nerrors -eq 0 ; then echo "All $TESTNAME tests passed." |