summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-01-18 14:51:32 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-01-18 14:51:32 (GMT)
commitee4c57cc089eb895856f649c865297d334bb30e3 (patch)
treea325db5d924a21f2896c1d91bc914a1151c10602 /tools/test
parenta8e4f6426e6b75e2456e3e1a4d369c046b9a4f94 (diff)
downloadhdf5-ee4c57cc089eb895856f649c865297d334bb30e3.zip
hdf5-ee4c57cc089eb895856f649c865297d334bb30e3.tar.gz
hdf5-ee4c57cc089eb895856f649c865297d334bb30e3.tar.bz2
Chnage test dir to avoid parallel test collisions
Diffstat (limited to 'tools/test')
-rw-r--r--tools/test/h5diff/h5diff_plugin.sh.in12
-rw-r--r--tools/test/h5dump/h5dump_plugin.sh.in3
-rw-r--r--tools/test/h5ls/h5ls_plugin.sh.in3
3 files changed, 10 insertions, 8 deletions
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index 80b827e..ffd2ea1 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -48,7 +48,7 @@ SRC_TOOLS="$srcdir/../.."
# testfiles source dirs for tools
SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
-TESTDIR=./testfiles
+TESTDIR=./testplug
test -d $TESTDIR || mkdir $TESTDIR
######################################################################
@@ -67,11 +67,6 @@ $SRC_H5DIFF_TESTFILES/h5diff_ud.txt
$SRC_H5DIFF_TESTFILES/h5diff_udfail.txt
"
-#
-# copy test files and expected output files from source dirs to test dir
-#
-COPY_TESTFILES="$LIST_HDF5_TEST_FILES"
-
# Main Body
# Create test directories if not exists yet.
test -d $PLUGIN_LIBDIR || mkdir -p $PLUGIN_LIBDIR
@@ -90,6 +85,11 @@ fi
# setup plugin path
ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
+#
+# copy test files and expected output files from source dirs to test dir
+#
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES"
+
COPY_TESTFILES_TO_TESTDIR()
{
# copy test files. Used -f to make sure get a new copy
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index dbfc433..2c33d58 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -34,6 +34,7 @@ PLUGIN_LIB="$FROM_DIR/libdynlibdump.*"
PLUGIN_LIBDIR=testdir3
RM='rm -rf'
+RM='rm -rf'
GREP='grep'
CMP='cmp'
DIFF='diff -c'
@@ -49,7 +50,7 @@ SRC_TOOLS="$srcdir/../.."
SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
-TESTDIR=./testfiles
+TESTDIR=./testplug
test -d $TESTDIR || mkdir $TESTDIR
######################################################################
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index 1717161..3436071 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -34,6 +34,7 @@ PLUGIN_LIB="$FROM_DIR/libdynlibls.*"
PLUGIN_LIBDIR=testdir3
RM='rm -rf'
+RM='rm -rf'
GREP='grep'
CMP='cmp -s'
DIFF='diff -c'
@@ -49,7 +50,7 @@ SRC_TOOLS="$srcdir/../.."
SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-TESTDIR=./testfiles
+TESTDIR=./testplug
test -d $TESTDIR || mkdir $TESTDIR
######################################################################