diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2017-03-22 17:39:12 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2017-03-22 17:39:12 (GMT) |
commit | 161a3b95165957b772e56b6f84fe7923fd3ddd11 (patch) | |
tree | b777f0f967be48a10d6e53343213ffa66086090e /test/testvdsswmr.sh.in | |
parent | 9c606c3d901f4190e456730266f25b0a65c88ab9 (diff) | |
parent | 30d5cf6c96d937b0ef5c97b43951ac778847d74c (diff) | |
download | hdf5-161a3b95165957b772e56b6f84fe7923fd3ddd11.zip hdf5-161a3b95165957b772e56b6f84fe7923fd3ddd11.tar.gz hdf5-161a3b95165957b772e56b6f84fe7923fd3ddd11.tar.bz2 |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop
Diffstat (limited to 'test/testvdsswmr.sh.in')
-rw-r--r-- | test/testvdsswmr.sh.in | 31 |
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." |