diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2017-03-18 02:31:05 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2017-03-18 02:31:05 (GMT) |
commit | 1a40bfd9416a1488a378fc32a8028b2907fe33eb (patch) | |
tree | 2e2be3012f76ada4df66d2316a7207601622a1b2 | |
parent | 7ebd91fbdb4525993521e37c63a023f00b91d6e5 (diff) | |
parent | 72eddf198d6a7c1b103356f9141a2b4fb8c79abf (diff) | |
download | hdf5-1a40bfd9416a1488a378fc32a8028b2907fe33eb.zip hdf5-1a40bfd9416a1488a378fc32a8028b2907fe33eb.tar.gz hdf5-1a40bfd9416a1488a378fc32a8028b2907fe33eb.tar.bz2 |
Merge pull request #345 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '72eddf198d6a7c1b103356f9141a2b4fb8c79abf':
CTestConfig.cmake: Report results to HDF5110 in buildbot and CDash.
-rw-r--r-- | CTestConfig.cmake | 4 | ||||
-rw-r--r-- | test/testswmr.sh.in | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 3f5f380..8efea80 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -10,10 +10,10 @@ set (CTEST_NIGHTLY_START_TIME "18:00:00 CST") set (CTEST_DROP_METHOD "http") if (CDASH_LOCAL) set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org") - set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk") + set (CTEST_DROP_LOCATION "/submit.php?project=HDF5110") else () set (CTEST_DROP_SITE "cdash.hdfgroup.org") - set (CTEST_DROP_LOCATION "/submit.php?project=HDF5+Trunk") + set (CTEST_DROP_LOCATION "/submit.php?project=HDF5110") endif () set (CTEST_DROP_SITE_CDASH TRUE) diff --git a/test/testswmr.sh.in b/test/testswmr.sh.in index c4a75e8..85e169a 100644 --- a/test/testswmr.sh.in +++ b/test/testswmr.sh.in @@ -123,6 +123,25 @@ 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 -p swmr_test/.libs +cp swmr* swmr_test + +# 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/swmr ]; then + cp .libs/swmr* swmr_test/.libs +fi + +cd swmr_test + + # Loop over index types for index_type in "-i ea" "-i b2" do @@ -521,6 +540,10 @@ done $DPRINT nerrors=$nerrors if test $nerrors -eq 0 ; then echo "SWMR tests passed." + if test -z "$HDF5_NOCLEANUP"; then + # delete the test directory + rm -rf swmr_test + fi exit 0 else echo "SWMR tests failed with $nerrors errors." |