diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-05-01 19:33:21 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-05-01 19:33:21 (GMT) |
| commit | c30a24bb166c8d8f27a41cd939f7bdd541ebccd0 (patch) | |
| tree | 2f9f77e8820d9ddfdb9d52ed0095c8a2b3c47251 | |
| parent | bbf07128b58eb11a2b222fd85199a382dc0b392e (diff) | |
| parent | 854223e3fcf5e90ad5fae25ff05deb4276ce001b (diff) | |
| download | hdf5-c30a24bb166c8d8f27a41cd939f7bdd541ebccd0.zip hdf5-c30a24bb166c8d8f27a41cd939f7bdd541ebccd0.tar.gz hdf5-c30a24bb166c8d8f27a41cd939f7bdd541ebccd0.tar.bz2 | |
Merge pull request #1686 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '854223e3fcf5e90ad5fae25ff05deb4276ce001b':
Add missing default
Correct varname
Separate out MPI tests that fail on MPI version
| -rw-r--r-- | config/cmake/scripts/HDF5config.cmake | 1 | ||||
| -rw-r--r-- | testpar/CMakeTests.cmake | 24 |
2 files changed, 22 insertions, 3 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 805aee1..3c1271f 100644 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -177,6 +177,7 @@ if (NOT DEFINED HPC) endif () endif () else () + set (CTEST_SITE "HPC.XXXX") set (CTEST_CMAKE_GENERATOR "Unix Makefiles") include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake) endif () diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index 214801b..aaaa4a4 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -25,10 +25,14 @@ add_test (NAME MPI_TEST-clear-testphdf5-objects ) set_tests_properties (MPI_TEST-clear-testphdf5-objects PROPERTIES FIXTURES_SETUP par_clear_testphdf5) +set (SKIP_tests + cchunk3 + tldsc +) set (SKIP_testphdf5 "") -#if (HDF5_OPENMPI_VERSION_SKIP) -# set (SKIP_testphdf5 "${SKIP_testphdf5};-x;ecdsetw") -#endif () +foreach (skiptest SKIP_tests) + set (SKIP_testphdf5 "${SKIP_testphdf5};-x;${skiptest}") +endforeach () add_test (NAME MPI_TEST_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} ${SKIP_testphdf5}) set_tests_properties (MPI_TEST_testphdf5 PROPERTIES @@ -41,6 +45,20 @@ if (last_test) endif () set (last_test "MPI_TEST_testphdf5") +#execute the skipped tests +foreach (skiptest SKIP_tests) + add_test (NAME MPI_TEST_testphdf5_${skiptest} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} -o ${skiptest}) + set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES + FIXTURES_REQUIRED par_clear_testphdf5 + ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}" + WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR} + ) + if (last_test) + set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES DEPENDS ${last_test}) + endif () + set (last_test "MPI_TEST_testphdf5_${skiptest}") +endforeach () + #if (HDF5_OPENMPI_VERSION_SKIP) # list (REMOVE_ITEM H5P_TESTS t_shapesame) #endif () |