diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-11-01 21:26:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-11-01 21:26:11 (GMT) |
| commit | 08901f283eeb75bef514be2a8ea285475e154e0d (patch) | |
| tree | 5a2e926b3aae6d96a7c3052e62b21784f7b43ca4 /tools/h5jam | |
| parent | d242fd85c4d280a85522bf6ad31e2998d10e1e08 (diff) | |
| download | hdf5-08901f283eeb75bef514be2a8ea285475e154e0d.zip hdf5-08901f283eeb75bef514be2a8ea285475e154e0d.tar.gz hdf5-08901f283eeb75bef514be2a8ea285475e154e0d.tar.bz2 | |
[svn-r24393] Cleanup testfiles from scripts. Update lists of files to be cleaned. CMake update to clean testfiles.
Tested: local cmake, autotools
Diffstat (limited to 'tools/h5jam')
| -rw-r--r-- | tools/h5jam/testh5jam.sh.in | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tools/h5jam/testh5jam.sh.in b/tools/h5jam/testh5jam.sh.in index 86edbee..16d9b3d 100644 --- a/tools/h5jam/testh5jam.sh.in +++ b/tools/h5jam/testh5jam.sh.in @@ -34,6 +34,7 @@ UNJAM=h5unjam # Tool to test JAM_BIN="$RUNSERIAL "`pwd` # The path of the jam binary UNJAM_BIN=`pwd` # The path of the jam binary +RM='rm -rf' CMP='cmp -s' DIFF='diff -c' AWK='awk' @@ -122,6 +123,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". # @@ -675,7 +689,8 @@ UNJAMTEST taj3.h5 --delete tac3.h5 CHECKFILE $TESTDIR/tall.h5 tac3.h5 CLEANUP tac3.h5 taj3.h5 - +# Clean up temporary files/directories +CLEAN_TESTFILES_AND_TESTDIR if test $nerrors -eq 0 ; then echo "All $TESTNAME tests passed." |