summaryrefslogtreecommitdiffstats
path: root/tools/test/h5ls
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-10-20 17:57:09 (GMT)
committerGitHub <noreply@github.com>2023-10-20 17:57:09 (GMT)
commitb5c63fb3fe6ee04b41d80368b406b5d45502ba00 (patch)
treee253a81461fa11533096795ee5064a827651325d /tools/test/h5ls
parent630d6e27c956859ff5c0d7a61df3c095fbd7c86b (diff)
downloadhdf5-b5c63fb3fe6ee04b41d80368b406b5d45502ba00.zip
hdf5-b5c63fb3fe6ee04b41d80368b406b5d45502ba00.tar.gz
hdf5-b5c63fb3fe6ee04b41d80368b406b5d45502ba00.tar.bz2
Test scripts now execute in-source with creation of tmp dir (#3723)
Fixes a few issues created in #3580: * Fixes a problem where committed tools test files were deleted when cleaning after an in-source build * Fixes issues with test file paths in Autotools tools test scripts
Diffstat (limited to 'tools/test/h5ls')
-rw-r--r--tools/test/h5ls/h5ls_plugin.sh.in2
-rw-r--r--tools/test/h5ls/testh5ls.sh.in2
-rw-r--r--tools/test/h5ls/testh5lsvds.sh.in4
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index 3408876..8b606d6 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -49,7 +49,7 @@ SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
-TESTDIR=./testplug
+TESTDIR=./tmppl
test -d $TESTDIR || mkdir $TESTDIR
######################################################################
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in
index fc6daab..01f9402 100644
--- a/tools/test/h5ls/testh5ls.sh.in
+++ b/tools/test/h5ls/testh5ls.sh.in
@@ -54,7 +54,7 @@ SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
SRC_H5LS_ERRFILES="$SRC_TOOLS/test/h5ls/errfiles"
SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
-TESTDIR=./testfiles
+TESTDIR=./tmp
test -d $TESTDIR || mkdir $TESTDIR
######################################################################
diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in
index 2408ee2..9038cf1 100644
--- a/tools/test/h5ls/testh5lsvds.sh.in
+++ b/tools/test/h5ls/testh5lsvds.sh.in
@@ -51,7 +51,7 @@ SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
TEST_P_DIR=./testfiles
-TESTDIR=./testfiles/vds
+TESTDIR=./tmpvds
test -d $TEST_P_DIR || mkdir -p $TEST_P_DIR
test -d $TESTDIR || mkdir $TESTDIR
@@ -145,7 +145,7 @@ 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=$SRC_H5LS_TESTFILES/vds
+ SDIR=$SRC_H5LS_TESTFILES
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