diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-06-10 18:16:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-06-10 18:16:11 (GMT) |
| commit | 1a2df2a6c3dcfc4c1030e6ba4d3da351f46a9d4f (patch) | |
| tree | 8a7f6270d79b963b44fd0a6c2bef6929cd3e1050 /testpar | |
| parent | b5a4fd517be73e3ce47a4d28d12469caae44ad85 (diff) | |
| download | hdf5-1a2df2a6c3dcfc4c1030e6ba4d3da351f46a9d4f.zip hdf5-1a2df2a6c3dcfc4c1030e6ba4d3da351f46a9d4f.tar.gz hdf5-1a2df2a6c3dcfc4c1030e6ba4d3da351f46a9d4f.tar.bz2 | |
Updates from develop
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/CMakeTests.cmake | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index 4095bd9..b4c8111 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -25,10 +25,25 @@ 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 + cchunk1 + cchunk2 + cchunk3 + cchunk4 + ecdsetw + eidsetw2 + selnone + cngrpw-ingrpr + cschunkw + ccchunkw + tldsc + actualio + MC_coll_MD_read +) 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 +56,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 () @@ -89,7 +118,7 @@ endforeach () # The t_pflush1 test is hard-coded to fail. set_tests_properties (MPI_TEST_t_pflush1 PROPERTIES WILL_FAIL "true") -#set_property (MPI_TEST_t_pflush1 PROPERTY PASS_REGULAR_EXPRESSION "PASSED") +#set_property (TEST MPI_TEST_t_pflush1 PROPERTY PASS_REGULAR_EXPRESSION "PASSED") set_tests_properties (MPI_TEST_t_pflush2 PROPERTIES DEPENDS MPI_TEST_t_pflush1) set_tests_properties (MPI_TEST_t_prestart PROPERTIES DEPENDS MPI_TEST_t_pshutdown) |