diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-11-01 21:15:37 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-11-01 21:15:37 (GMT) |
| commit | 819b8099e24809cdb9c9e2e11078cffc0e754ace (patch) | |
| tree | fc87a9a3666851cd012e7782b3f14e306dc55490 /tools/misc | |
| parent | 2136f11a47ef28553d9e6e3ade726d28590087f3 (diff) | |
| download | hdf5-819b8099e24809cdb9c9e2e11078cffc0e754ace.zip hdf5-819b8099e24809cdb9c9e2e11078cffc0e754ace.tar.gz hdf5-819b8099e24809cdb9c9e2e11078cffc0e754ace.tar.bz2 | |
[svn-r24392] Cleanup testfiles from scripts. Update lists of files to be cleaned. CMake update to clean testfiles.
Tested: local cmake, autools, and h5committest
Diffstat (limited to 'tools/misc')
| -rw-r--r-- | tools/misc/testh5mkgrp.sh.in | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tools/misc/testh5mkgrp.sh.in b/tools/misc/testh5mkgrp.sh.in index 5ec1a28..85205a8 100644 --- a/tools/misc/testh5mkgrp.sh.in +++ b/tools/misc/testh5mkgrp.sh.in @@ -31,6 +31,7 @@ H5LS=h5ls # The h5ls tool name H5LS_ARGS=-vr # Arguments to the h5ls tool H5LS_BIN=`pwd`/../h5ls/$H5LS # The path of the h5ls tool binary +RM='rm -rf' CMP='cmp' DIFF='diff -c' CP='cp' @@ -111,6 +112,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() @@ -299,6 +313,8 @@ RUNTEST h5mkgrp_nested_lp.h5 "-lp" /one/two RUNTEST h5mkgrp_nested_mult_p.h5 "-p" /one/two /three/four RUNTEST h5mkgrp_nested_mult_lp.h5 "-lp" /one/two /three/four +# Clean up temporary files/directories +CLEAN_TESTFILES_AND_TESTDIR if test $nerrors -eq 0 ; then echo "All $TESTNAME tests passed." |