summaryrefslogtreecommitdiffstats
path: root/test/testvdsswmr.sh.in
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2017-03-22 16:48:47 (GMT)
committerlrknox <lrknox>2017-03-22 17:00:52 (GMT)
commit36a30ecfd288afdf8ea62a858644e622ce72fd58 (patch)
tree8282f7f5c7be529b6fb992de532a1924e4534e0a /test/testvdsswmr.sh.in
parentd60ca826c00533d72f94e38c1b2cf790e1b3f190 (diff)
downloadhdf5-36a30ecfd288afdf8ea62a858644e622ce72fd58.zip
hdf5-36a30ecfd288afdf8ea62a858644e622ce72fd58.tar.gz
hdf5-36a30ecfd288afdf8ea62a858644e622ce72fd58.tar.bz2
Merge pull request #358 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '82183c7cdc50f9dc41ef8238c6a2bef6f1c7fcde': Run all scripts using signal files between processes in their own directories to avoid accidental deletion of the signal files.
Diffstat (limited to 'test/testvdsswmr.sh.in')
-rw-r--r--test/testvdsswmr.sh.in31
1 files changed, 30 insertions, 1 deletions
diff --git a/test/testvdsswmr.sh.in b/test/testvdsswmr.sh.in
index d69b8c0..3ada67b 100644
--- a/test/testvdsswmr.sh.in
+++ b/test/testvdsswmr.sh.in
@@ -109,6 +109,31 @@ while [ $# -gt 0 ]; do
esac
done
+# HDF5 has several tests that create and delete signal files to communicate
+# between processes, and it seems that even though the names of the files are
+# different, occasionally the wrong file is deleted, interrupting the flow of
+# the test. Running each of these tests in its own directory should eliminate
+# the problem.
+mkdir vds_swmr_test
+for FILE in vds_swmr*; do
+ case "$FILE" in
+ *.o) continue ;; ## don't copy the .o files
+ esac
+ cp $FILE vds_swmr_test
+done
+
+# With the --disable-shared option, swmr program files are built in the test
+# directory, otherwise they are in test/.libs with a corresponding wrapper
+# script in the test directory. The programs or wrapper scripts in test should
+# always be copied, swmr files in .libs should be copied only if they exists.
+if [ -f .libs/vds_swmr_writer ]; then
+ mkdir vds_swmr_test/.libs
+ cp .libs/vds_swmr* vds_swmr_test/.libs
+fi
+
+cd vds_swmr_test
+
+
echo
echo "###############################################################################"
echo "## Basic VDS SWMR test - writing to a tiled plane"
@@ -187,10 +212,14 @@ fi
###############################################################################
## Report and exit
###############################################################################
-
+cd ..
$DPRINT nerrors=$nerrors
if test $nerrors -eq 0 ; then
echo "VDS SWMR tests passed."
+ if test -z "$HDF5_NOCLEANUP"; then
+ # delete the test directory
+ rm -rf vds_swmr_test
+ fi
exit 0
else
echo "VDS SWMR tests failed with $nerrors errors."