summaryrefslogtreecommitdiffstats
path: root/tools/test/h5diff/testh5diff.sh.in
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2017-01-13 16:33:50 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2017-01-13 16:33:50 (GMT)
commitbd85e57904f1f943774bb99ea5e8b0d074db0edb (patch)
tree4d94cbb8292116af3cf369adf1b47a014210ae17 /tools/test/h5diff/testh5diff.sh.in
parent089afc48561ba8838d6a515c6b00fc6f7032ca13 (diff)
parent8452976de5d770adcf3892b25c8480042170fccd (diff)
downloadhdf5-bd85e57904f1f943774bb99ea5e8b0d074db0edb.zip
hdf5-bd85e57904f1f943774bb99ea5e8b0d074db0edb.tar.gz
hdf5-bd85e57904f1f943774bb99ea5e8b0d074db0edb.tar.bz2
Merge pull request #250 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '8452976de5d770adcf3892b25c8480042170fccd': tools/test/h5diff/testh5diff.sh.in: Add code to delete copies of test .h5 files copied from tools/testfiles/vds to tools/test/h5diff/testfiles when running "make check" for an in-source build.
Diffstat (limited to 'tools/test/h5diff/testh5diff.sh.in')
-rw-r--r--tools/test/h5diff/testh5diff.sh.in15
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index d2f1397..39b87ca 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -382,6 +382,21 @@ CLEAN_TESTFILES_AND_TESTDIR()
INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
$RM $TESTDIR
+ else
+ # files in $LIST_HDF5_VDS_TEST_FILES are copied in from a different
+ # directory, so when srcdir is the same as destdir and $TESTDIR is
+ # not deleted, the copy n $TESTDIR of each file from
+ # $LIST_HDF5_VDS_TEST_FILES will need to be deleted.
+ for tstfile in $LIST_HDF5_VDS_TEST_FILES
+ do
+ # ignore '#' comment
+ echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
+ RET=$?
+ if [ $RET -eq 1 ]; then
+ fname=`basename $tstfile`
+ rm $TESTDIR/$fname
+ fi
+ done
fi
}