diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-11-22 13:51:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 13:51:30 (GMT) |
| commit | 3ea21ccb3e84dae935c32faff5d10ce9672a3265 (patch) | |
| tree | 825781aed8fbee0af89bc0303921757ba7c360e0 | |
| parent | 046440400f877ce1f6c94ccce0c17c0619647b42 (diff) | |
| download | hdf5-3ea21ccb3e84dae935c32faff5d10ce9672a3265.zip hdf5-3ea21ccb3e84dae935c32faff5d10ce9672a3265.tar.gz hdf5-3ea21ccb3e84dae935c32faff5d10ce9672a3265.tar.bz2 | |
Add HDF5_DISABLE_TESTS_REGEX option to skip tests (#3859)
43 files changed, 912 insertions, 301 deletions
diff --git a/CMakeTests.cmake b/CMakeTests.cmake index 1dfa700..6619901 100644 --- a/CMakeTests.cmake +++ b/CMakeTests.cmake @@ -23,6 +23,9 @@ math (EXPR CTEST_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 2") math (EXPR CTEST_VERY_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 3") + option (HDF5_DISABLE_TESTS_REGEX "Regex pattern to set execution of specific tests to DISABLED" "") + mark_as_advanced (HDF5_DISABLE_TESTS_REGEX) + option (HDF5_TEST_API "Execute HDF5 API tests" OFF) mark_as_advanced (HDF5_TEST_API) if (HDF5_TEST_API) diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index fc94a68..224b099 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -35,6 +35,9 @@ endif () set_tests_properties (CPP_testhdf5 PROPERTIES WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) +if ("CPP_testhdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (CPP_testhdf5 PROPERTIES DISABLED true) +endif () ############################################################################## ############################################################################## diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake index 5405df3..52f8069 100644 --- a/c++/test/CMakeVFDTests.cmake +++ b/c++/test/CMakeVFDTests.cmake @@ -37,6 +37,9 @@ macro (ADD_VFD_TEST vfdname resultcode) -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT}) + if ("CPP_VFD-${vfdname}-cpp_testhdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index 2a57db8..37bf0d4 100644 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake @@ -184,6 +184,11 @@ list (APPEND CTEST_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}" "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake" ) +if (EXISTS "${CTEST_SCRIPT_DIRECTORY}/SkipTests.log") + list(APPEND CTEST_NOTES_FILES + "${CTEST_SCRIPT_DIRECTORY}/SkipTests.log" + ) +endif () #----------------------------------------------------------------------------- # Check for required variables. diff --git a/fortran/test/CMakeTests.cmake b/fortran/test/CMakeTests.cmake index 02c23bb..46b8972 100644 --- a/fortran/test/CMakeTests.cmake +++ b/fortran/test/CMakeTests.cmake @@ -94,6 +94,9 @@ endif () set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES FIXTURES_REQUIRED clear_testhdf5_fortran ) +if ("FORTRAN_testhdf5_fortran" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES DISABLED true) +endif () #-- Adding test for testhdf5_fortran_1_8 if (HDF5_ENABLE_USING_MEMCHECKER) @@ -118,6 +121,9 @@ set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES DEPENDS FORTRAN_testhdf5_fortran FIXTURES_REQUIRED clear_testhdf5_fortran ) +if ("FORTRAN_testhdf5_fortran_1_8" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES DISABLED true) +endif () #-- Adding test for fortranlib_test_F03 if (HDF5_ENABLE_USING_MEMCHECKER) @@ -142,6 +148,9 @@ set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES DEPENDS FORTRAN_testhdf5_fortran_1_8 FIXTURES_REQUIRED clear_testhdf5_fortran ) +if ("FORTRAN_fortranlib_test_F03" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES DISABLED true) +endif () #-- Adding test for vol_connector if (HDF5_ENABLE_USING_MEMCHECKER) @@ -164,6 +173,9 @@ endif () set_tests_properties (FORTRAN_vol_connector PROPERTIES FIXTURES_REQUIRED clear_testhdf5_fortran ) +if ("FORTRAN_vol_connector" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (FORTRAN_vol_connector PROPERTIES DISABLED true) +endif () #-- Adding test for fflush1 add_test ( @@ -177,6 +189,9 @@ add_test ( set_tests_properties (FORTRAN_fflush1 PROPERTIES DEPENDS FORTRAN_flush1-clear-objects ) +if ("FORTRAN_fflush1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (FORTRAN_fflush1 PROPERTIES DISABLED true) +endif () #-- Adding test for fflush2 add_test ( @@ -186,6 +201,9 @@ add_test ( set_tests_properties (FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1 ) +if ("FORTRAN_fflush2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (FORTRAN_fflush2 PROPERTIES DISABLED true) +endif () add_test ( NAME FORTRAN_flush1-clean-objects COMMAND ${CMAKE_COMMAND} -E remove flush.h5 diff --git a/fortran/testpar/CMakeTests.cmake b/fortran/testpar/CMakeTests.cmake index 473049f..f9ce2b8 100644 --- a/fortran/testpar/CMakeTests.cmake +++ b/fortran/testpar/CMakeTests.cmake @@ -16,5 +16,16 @@ ############################################################################## ############################################################################## add_test (NAME MPI_TEST_FORT_parallel_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:parallel_test> ${MPIEXEC_POSTFLAGS}) +if ("MPI_TEST_FORT_parallel_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_FORT_parallel_test PROPERTIES DISABLED true) +endif () + add_test (NAME MPI_TEST_FORT_subfiling_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:subfiling_test> ${MPIEXEC_POSTFLAGS}) +if ("MPI_TEST_FORT_subfiling_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_FORT_subfiling_test PROPERTIES DISABLED true) +endif () + add_test (NAME MPI_TEST_FORT_async_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:async_test> ${MPIEXEC_POSTFLAGS}) +if ("MPI_TEST_FORT_async_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_FORT_async_test PROPERTIES DISABLED true) +endif () diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake index 4137270..b07dd6d 100644 --- a/hl/c++/test/CMakeTests.cmake +++ b/hl/c++/test/CMakeTests.cmake @@ -44,6 +44,9 @@ else () ) endif () set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects) +if ("HL_CPP_ptableTest" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (HL_CPP_ptableTest PROPERTIES DISABLED true) +endif () add_test ( NAME HL_CPP_ptableTest-clean-objects COMMAND ${CMAKE_COMMAND} @@ -53,3 +56,4 @@ set_tests_properties (HL_CPP_ptableTest-clean-objects PROPERTIES DEPENDS HL_CPP_ptableTest WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) + diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake index 209186b..8421872 100644 --- a/hl/fortran/test/CMakeTests.cmake +++ b/hl/fortran/test/CMakeTests.cmake @@ -68,6 +68,9 @@ macro (ADD_H5_FORTRAN_TEST file) FIXTURES_REQUIRED clear_HL_FORTRAN_test WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) + if ("HL_FORTRAN_f90_${file}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES DISABLED true) + endif () endmacro () foreach (h5_test ${H5_TESTS}) diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake index 781ed14..6ec5f29 100644 --- a/hl/test/CMakeTests.cmake +++ b/hl/test/CMakeTests.cmake @@ -118,6 +118,9 @@ macro (HL_ADD_TEST hl_name) ENVIRONMENT "srcdir=${HDF5_HL_TEST_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR} ) + if ("HL_${hl_name}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (HL_${hl_name} PROPERTIES DISABLED true) + endif () endmacro () HL_add_test (test_lite ) diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake index 7c1a7f5..aa4c41a 100644 --- a/hl/tools/h5watch/CMakeTests.cmake +++ b/hl/tools/h5watch/CMakeTests.cmake @@ -86,6 +86,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes DEPENDS ${last_test} FIXTURES_REQUIRED gen_test_watch ) + if ("H5WATCH_ARGS-h5watch-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DISABLED true) + endif () set (last_test "H5WATCH_ARGS-h5watch-${resultfile}") endif () endmacro () @@ -109,6 +112,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes DEPENDS ${last_test} FIXTURES_REQUIRED gen_test_watch ) + if ("H5WATCH_ARGS-h5watch-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DISABLED true) + endif () set (last_test "H5WATCH_ARGS-h5watch-${resultfile}") endif () endmacro () @@ -131,6 +137,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes DEPENDS ${last_test} FIXTURES_REQUIRED gen_test_watch ) + if ("H5WATCH-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5WATCH-${resultfile} PROPERTIES DISABLED true) + endif () set (last_test "H5WATCH-${resultfile}") endif () endmacro () diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt index 967795b..43137a2 100644 --- a/java/test/CMakeLists.txt +++ b/java/test/CMakeLists.txt @@ -175,6 +175,9 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL) FIXTURES_REQUIRED clear_JUnit WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test ) + if ("JUnit-${test_file}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (JUnit-${test_file} PROPERTIES DISABLED true) + endif () endforeach () @@ -208,6 +211,9 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL) ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2" WORKING_DIRECTORY ${HDF5_BINARY_DIR}/java/test/${volname} ) + if ("JUnit-VOL-${volname}-${voltest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (JUnit-VOL-${volname}-${voltest} PROPERTIES DISABLED true) + endif () add_test ( NAME JUnit-VOL-${volname}-${voltest}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index c837d1c..965dd94 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -879,6 +879,7 @@ if (BUILD_TESTING) if (HDF5_TEST_VFD) HDF5_TEST_FHEAP_VFD "Execute fheap test with different VFDs" ON TEST_SHELL_SCRIPTS "Enable shell script tests" ON + HDF5_DISABLE_TESTS_REGEX "Regex pattern to set execution of specific tests to DISABLED" "" ---------------- External Library Options --------------------- HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO" diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 8268cbe..824905b 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -47,6 +47,14 @@ New Features Configuration: ------------- + - Added new option for CMake to mark tests as SKIPPED. + + HDF5_DISABLE_TESTS_REGEX is a REGEX string that will be checked with + test names and if there is a match then that test's property will be + set to DISABLED. HDF5_DISABLE_TESTS_REGEX can be initialized on the + command line: "-DHDF5_DISABLE_TESTS_REGEX:STRING=<regex>" + See CMake documentation for regex-specification. + - Added defaults to CMake for long double conversion checks HDF5 performs a couple of checks at build time to see if long double diff --git a/test/API/CMakeLists.txt b/test/API/CMakeLists.txt index 9495acd..43c26f0 100644 --- a/test/API/CMakeLists.txt +++ b/test/API/CMakeLists.txt @@ -20,8 +20,8 @@ if (HDF5_TEST_API_ENABLE_ASYNC) endif () configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/H5_api_test_config.h.in - ${HDF5_TEST_BINARY_DIR}/H5_api_test_config.h + ${CMAKE_CURRENT_SOURCE_DIR}/H5_api_test_config.h.in + ${HDF5_TEST_BINARY_DIR}/H5_api_test_config.h ) #------------------------------------------------------------------------------ @@ -35,20 +35,20 @@ endif () # Variables, definitions, etc. for API tests #------------------------------------------------------------------------------ set (HDF5_API_TESTS - attribute - dataset - datatype - file - group - link - misc - object + attribute + dataset + datatype + file + group + link + misc + object ) if (HDF5_TEST_API_ENABLE_ASYNC) set (HDF5_API_TESTS - ${HDF5_API_TESTS} - async + ${HDF5_API_TESTS} + async ) endif () @@ -65,46 +65,46 @@ set (HDF5_API_TESTS_EXTRA # TODO: Run h5delete tool with appropriate env. vars for # connectors to remove these files set (HDF5_API_TESTS_FILES - # Test file used by main tests - H5_api_test.h5 - # 'file' tests - test_file.h5 - invalid_params_file.h5 - excl_flag_file.h5 - overlapping_file.h5 - file_permission.h5 - flush_file.h5 - property_list_test_file1.h5 - property_list_test_file2.h5 - intent_test_file.h5 - file_obj_count1.h5 - file_obj_count2.h5 - file_mount.h5 - file_name_retrieval.h5 - filespace_info.h5 - test_file_id.h5 - test_close_degree.h5 - test_free_sections.h5 - file_size.h5 - file_info.h5 - double_group_open.h5 - # 'link' tests - ext_link_file.h5 - ext_link_file_2.h5 - ext_link_file_3.h5 - ext_link_file_4.h5 - ext_link_file_ping_pong_1.h5 - ext_link_file_ping_pong_2.h5 - ext_link_invalid_params_file.h5 - # 'object' tests - object_copy_test_file.h5 - # 'async' tests - H5_api_async_test.h5 - H5_api_async_test_0.h5 - H5_api_async_test_1.h5 - H5_api_async_test_2.h5 - H5_api_async_test_3.h5 - H5_api_async_test_4.h5 + # Test file used by main tests + H5_api_test.h5 + # 'file' tests + test_file.h5 + invalid_params_file.h5 + excl_flag_file.h5 + overlapping_file.h5 + file_permission.h5 + flush_file.h5 + property_list_test_file1.h5 + property_list_test_file2.h5 + intent_test_file.h5 + file_obj_count1.h5 + file_obj_count2.h5 + file_mount.h5 + file_name_retrieval.h5 + filespace_info.h5 + test_file_id.h5 + test_close_degree.h5 + test_free_sections.h5 + file_size.h5 + file_info.h5 + double_group_open.h5 + # 'link' tests + ext_link_file.h5 + ext_link_file_2.h5 + ext_link_file_3.h5 + ext_link_file_4.h5 + ext_link_file_ping_pong_1.h5 + ext_link_file_ping_pong_2.h5 + ext_link_invalid_params_file.h5 + # 'object' tests + object_copy_test_file.h5 + # 'async' tests + H5_api_async_test.h5 + H5_api_async_test_0.h5 + H5_api_async_test_1.h5 + H5_api_async_test_2.h5 + H5_api_async_test_3.h5 + H5_api_async_test_4.h5 ) #----------------------------------------------------------------------------- @@ -112,58 +112,37 @@ set (HDF5_API_TESTS_FILES #----------------------------------------------------------------------------- foreach (api_test ${HDF5_API_TESTS}) set (HDF5_API_TEST_SRCS - ${HDF5_API_TEST_SRCS} - ${CMAKE_CURRENT_SOURCE_DIR}/H5_api_${api_test}_test.c + ${HDF5_API_TEST_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/H5_api_${api_test}_test.c ) endforeach () set (HDF5_API_TEST_SRCS - ${HDF5_API_TEST_SRCS} - ${CMAKE_CURRENT_SOURCE_DIR}/H5_api_test.c - ${HDF5_TEST_API_SRC_DIR}/H5_api_test_util.c + ${HDF5_API_TEST_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/H5_api_test.c + ${HDF5_TEST_API_SRC_DIR}/H5_api_test_util.c ) add_executable (h5_api_test ${HDF5_API_TEST_SRCS}) -target_include_directories ( - h5_api_test - PRIVATE - "${HDF5_SRC_INCLUDE_DIRS}" - "${HDF5_TEST_SRC_DIR}" - "${HDF5_TEST_API_SRC_DIR}" - "${HDF5_SRC_BINARY_DIR}" - "${HDF5_TEST_BINARY_DIR}" -) -target_compile_options ( - h5_api_test - PRIVATE - "${HDF5_CMAKE_C_FLAGS}" -) -target_compile_definitions ( - h5_api_test - PRIVATE - "${HDF5_TEST_COMPILE_DEFS_PRIVATE}" +target_include_directories (h5_api_test + PRIVATE + "${HDF5_SRC_INCLUDE_DIRS}" + "${HDF5_TEST_SRC_DIR}" + "${HDF5_TEST_API_SRC_DIR}" + "${HDF5_SRC_BINARY_DIR}" + "${HDF5_TEST_BINARY_DIR}" ) +target_compile_options (h5_api_test PRIVATE "${HDF5_CMAKE_C_FLAGS}") +target_compile_definitions (h5_api_test PRIVATE "${HDF5_TEST_COMPILE_DEFS_PRIVATE}") # Always prefer linking the shared HDF5 library by default if (BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (h5_api_test SHARED) - target_link_libraries ( - h5_api_test - PRIVATE - ${HDF5_TEST_LIBSH_TARGET} - ) + target_link_libraries (h5_api_test PRIVATE ${HDF5_TEST_LIBSH_TARGET}) else () TARGET_C_PROPERTIES (h5_api_test STATIC) - target_link_libraries ( - h5_api_test - PRIVATE - ${HDF5_TEST_LIB_TARGET} - ) + target_link_libraries (h5_api_test PRIVATE ${HDF5_TEST_LIB_TARGET}) endif () -set_target_properties ( - h5_api_test - PROPERTIES - FOLDER test/API -) +set_target_properties (h5_api_test PROPERTIES FOLDER test/API) # Add Target to clang-format if (HDF5_ENABLE_FORMATTERS) clang_format (HDF5_TEST_h5_api_test_FORMAT h5_api_test) @@ -189,12 +168,12 @@ if (HDF5_TEST_SERIAL) endif () if (HDF5_TEST_API_CLIENT_HELPER) set (HDF5_TEST_API_DRIVER_EXTRA_FLAGS ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} - --client-helper ${HDF5_TEST_API_CLIENT_HELPER} + --client-helper ${HDF5_TEST_API_CLIENT_HELPER} ) endif () if (HDF5_TEST_API_CLIENT_INIT) set (HDF5_TEST_API_DRIVER_EXTRA_FLAGS ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} - --client-init ${HDF5_TEST_API_CLIENT_INIT} + --client-init ${HDF5_TEST_API_CLIENT_INIT} ) endif () @@ -202,15 +181,17 @@ if (HDF5_TEST_SERIAL) set (last_api_test "") foreach (api_test ${HDF5_API_TESTS}) add_test ( - NAME "h5_api_test_${api_test}" - COMMAND $<TARGET_FILE:h5_api_test_driver> - --server ${HDF5_TEST_API_SERVER} - --client $<TARGET_FILE:h5_api_test> "${api_test}" - --serial - ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} + NAME h5_api_test_${api_test} + COMMAND $<TARGET_FILE:h5_api_test_driver> + --server ${HDF5_TEST_API_SERVER} + --client $<TARGET_FILE:h5_api_test> ${api_test} + --serial + ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} ) - - set_tests_properties ("h5_api_test_${api_test}" PROPERTIES DEPENDS "${last_api_test}") + if ("h5_api_test_${api_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (h5_api_test_${api_test} PROPERTIES DISABLED true) + endif () + set_tests_properties (h5_api_test_${api_test} PROPERTIES DEPENDS ${last_api_test}) set (last_api_test "h5_api_test_${api_test}") endforeach () @@ -218,13 +199,16 @@ if (HDF5_TEST_SERIAL) # Hook external tests to same test suite foreach (ext_api_test ${HDF5_API_EXT_SERIAL_TESTS}) add_test ( - NAME "h5_api_ext_test_${ext_api_test}" - COMMAND $<TARGET_FILE:h5_api_test_driver> - --server ${HDF5_TEST_API_SERVER} - --client $<TARGET_FILE:${ext_api_test}> - --serial - ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} + NAME h5_api_ext_test_${ext_api_test} + COMMAND $<TARGET_FILE:h5_api_test_driver> + --server ${HDF5_TEST_API_SERVER} + --client $<TARGET_FILE:${ext_api_test}> + --serial + ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} ) + if ("h5_api_ext_test_${ext_api_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (h5_api_ext_test_${ext_api_test} PROPERTIES DISABLED true) + endif () endforeach () if (BUILD_SHARED_LIBS) @@ -256,64 +240,59 @@ if (HDF5_TEST_SERIAL) set (last_api_test "") foreach (api_test ${HDF5_API_TESTS}) add_test ( - NAME "${external_vol_tgt}-h5_api_test_${api_test}" - COMMAND $<TARGET_FILE:h5_api_test_driver> - --server ${HDF5_TEST_API_SERVER} - --client $<TARGET_FILE:h5_api_test> "${api_test}" - --serial - ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} + NAME ${external_vol_tgt}-h5_api_test_${api_test} + COMMAND $<TARGET_FILE:h5_api_test_driver> + --server ${HDF5_TEST_API_SERVER} + --client $<TARGET_FILE:h5_api_test> ${api_test} + --serial + ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} ) - set_tests_properties ( - "${external_vol_tgt}-h5_api_test_${api_test}" - PROPERTIES - ENVIRONMENT - "${vol_test_env}" - WORKING_DIRECTORY - "${HDF5_TEST_BINARY_DIR}/${external_vol_tgt}" - DEPENDS - "${last_api_test}" + set_tests_properties (${external_vol_tgt}-h5_api_test_${api_test} + PROPERTIES + ENVIRONMENT "${vol_test_env}" + WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${external_vol_tgt} + DEPENDS ${last_api_test} ) - + if ("${external_vol_tgt}-h5_api_test_${api_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (${external_vol_tgt}-h5_api_test_${api_test} PROPERTIES DISABLED true) + endif () set (last_api_test "${external_vol_tgt}-h5_api_test_${api_test}") endforeach () # Add any extra HDF5 tests to test suite foreach (hdf5_test ${HDF5_API_TESTS_EXTRA}) add_test ( - NAME "${external_vol_tgt}-h5_api_test_${hdf5_test}" - COMMAND $<TARGET_FILE:h5_api_test_driver> - --server ${HDF5_TEST_API_SERVER} - --client $<TARGET_FILE:${hdf5_test}> - --serial - ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} + NAME ${external_vol_tgt}-h5_api_test_${hdf5_test} + COMMAND $<TARGET_FILE:h5_api_test_driver> + --server ${HDF5_TEST_API_SERVER} + --client $<TARGET_FILE:${hdf5_test}> + --serial + ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} ) - set_tests_properties ( - "${external_vol_tgt}-h5_api_test_${hdf5_test}" - PROPERTIES - ENVIRONMENT - "${vol_test_env}" - WORKING_DIRECTORY - "${HDF5_TEST_BINARY_DIR}/${external_vol_tgt}" + set_tests_properties (${external_vol_tgt}-h5_api_test_${hdf5_test} + PROPERTIES + ENVIRONMENT "${vol_test_env}" + WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${external_vol_tgt} ) + if ("${external_vol_tgt}-h5_api_test_${hdf5_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (${external_vol_tgt}-h5_api_test_${hdf5_test} PROPERTIES DISABLED true) + endif () endforeach () # Hook external tests to same test suite foreach (ext_api_test ${HDF5_API_EXT_SERIAL_TESTS}) add_test ( - NAME "${external_vol_tgt}-h5_api_ext_test_${ext_api_test}" - COMMAND $<TARGET_FILE:h5_api_test_driver> - --server ${HDF5_TEST_API_SERVER} - --client $<TARGET_FILE:${ext_api_test}> - --serial - ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} + NAME ${external_vol_tgt}-h5_api_ext_test_${ext_api_test} + COMMAND $<TARGET_FILE:h5_api_test_driver> + --server ${HDF5_TEST_API_SERVER} + --client $<TARGET_FILE:${ext_api_test}> + --serial + ${HDF5_TEST_API_DRIVER_EXTRA_FLAGS} ) - set_tests_properties ( - "${external_vol_tgt}-h5_api_ext_test_${ext_api_test}" - PROPERTIES - ENVIRONMENT - "${vol_test_env}" - WORKING_DIRECTORY - "${HDF5_TEST_BINARY_DIR}/${external_vol_tgt}" + set_tests_properties (${external_vol_tgt}-h5_api_ext_test_${ext_api_test} + PROPERTIES + ENVIRONMENT "${vol_test_env}" + WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${external_vol_tgt} ) endforeach () endforeach () @@ -323,11 +302,13 @@ if (HDF5_TEST_SERIAL) set (last_api_test "") foreach (api_test ${HDF5_API_TESTS}) add_test ( - NAME "h5_api_test_${api_test}" - COMMAND $<TARGET_FILE:h5_api_test> "${api_test}" + NAME h5_api_test_${api_test} + COMMAND $<TARGET_FILE:h5_api_test> ${api_test} ) - - set_tests_properties ("h5_api_test_${api_test}" PROPERTIES DEPENDS "${last_api_test}") + if ("h5_api_test_${api_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (h5_api_test_${api_test} PROPERTIES DISABLED true) + endif () + set_tests_properties (h5_api_test_${api_test} PROPERTIES DEPENDS ${last_api_test}) set (last_api_test "h5_api_test_${api_test}") endforeach () @@ -335,9 +316,12 @@ if (HDF5_TEST_SERIAL) # Hook external tests to same test suite foreach (ext_api_test ${HDF5_API_EXT_SERIAL_TESTS}) add_test ( - NAME "h5_api_ext_test_${ext_api_test}" - COMMAND $<TARGET_FILE:${ext_api_test}> + NAME h5_api_ext_test_${ext_api_test} + COMMAND $<TARGET_FILE:${ext_api_test}> ) + if ("h5_api_ext_test_${ext_api_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (h5_api_ext_test_${ext_api_test} PROPERTIES DISABLED true) + endif () endforeach () if (BUILD_SHARED_LIBS) @@ -369,37 +353,35 @@ if (HDF5_TEST_SERIAL) set (last_api_test "") foreach (api_test ${HDF5_API_TESTS}) add_test ( - NAME "${external_vol_tgt}-h5_api_test_${api_test}" - COMMAND $<TARGET_FILE:h5_api_test> "${api_test}" + NAME ${external_vol_tgt}-h5_api_test_${api_test} + COMMAND $<TARGET_FILE:h5_api_test> ${api_test} ) - set_tests_properties ( - "${external_vol_tgt}-h5_api_test_${api_test}" - PROPERTIES - ENVIRONMENT - "${vol_test_env}" - WORKING_DIRECTORY - "${HDF5_TEST_BINARY_DIR}/${external_vol_tgt}" - DEPENDS - "${last_api_test}" + set_tests_properties (${external_vol_tgt}-h5_api_test_${api_test} + PROPERTIES + ENVIRONMENT "${vol_test_env}" + WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${external_vol_tgt} + DEPENDS ${last_api_test} ) - + if ("${external_vol_tgt}-h5_api_test_${api_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (${external_vol_tgt}-h5_api_test_${api_test} PROPERTIES DISABLED true) + endif () set (last_api_test "${external_vol_tgt}-h5_api_test_${api_test}") endforeach () # Add any extra HDF5 tests to test suite foreach (hdf5_test ${HDF5_API_TESTS_EXTRA}) add_test ( - NAME "${external_vol_tgt}-h5_api_test_${hdf5_test}" - COMMAND $<TARGET_FILE:${hdf5_test}> + NAME ${external_vol_tgt}-h5_api_test_${hdf5_test} + COMMAND $<TARGET_FILE:${hdf5_test}> ) - set_tests_properties ( - "${external_vol_tgt}-h5_api_test_${hdf5_test}" - PROPERTIES - ENVIRONMENT - "${vol_test_env}" - WORKING_DIRECTORY - "${HDF5_TEST_BINARY_DIR}/${external_vol_tgt}" + set_tests_properties (${external_vol_tgt}-h5_api_test_${hdf5_test} + PROPERTIES + ENVIRONMENT "${vol_test_env}" + WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${external_vol_tgt} ) + if ("${external_vol_tgt}-h5_api_test_${hdf5_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (${external_vol_tgt}-h5_api_test_${hdf5_test} PROPERTIES DISABLED true) + endif () endforeach () endforeach () endif() @@ -412,36 +394,25 @@ endif () #----------------------------------------------------------------------------- if (HDF5_EXPORTED_TARGETS AND HDF5_TEST_API_INSTALL) install ( - TARGETS - h5_api_test - EXPORT - ${HDF5_EXPORTED_TARGETS} - DESTINATION - ${HDF5_INSTALL_BIN_DIR} - PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - COMPONENT - tests + TARGETS h5_api_test + EXPORT ${HDF5_EXPORTED_TARGETS} + DESTINATION ${HDF5_INSTALL_BIN_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + COMPONENT tests ) foreach (api_test_extra ${HDF5_API_TESTS_EXTRA}) if (TARGET ${api_test_extra}) - set_target_properties ( - ${api_test_extra} - PROPERTIES - OUTPUT_NAME "h5_api_test_${api_test_extra}" + set_target_properties (${api_test_extra} + PROPERTIES + OUTPUT_NAME "h5_api_test_${api_test_extra}" ) install ( - TARGETS - ${api_test_extra} - EXPORT - ${HDF5_EXPORTED_TARGETS} - DESTINATION - ${HDF5_INSTALL_BIN_DIR} - PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - COMPONENT - tests + TARGETS ${api_test_extra} + EXPORT ${HDF5_EXPORTED_TARGETS} + DESTINATION ${HDF5_INSTALL_BIN_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + COMPONENT tests ) endif () endforeach () diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fa73a0f..34e6f29 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -63,10 +63,8 @@ if (BUILD_STATIC_LIBS) INSTALL_TARGET_PDB (${HDF5_TEST_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} libraries) install ( - TARGETS - ${HDF5_TEST_LIB_TARGET} - EXPORT - ${HDF5_EXPORTED_TARGETS} + TARGETS ${HDF5_TEST_LIB_TARGET} + EXPORT ${HDF5_EXPORTED_TARGETS} LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT libraries ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT libraries RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT libraries @@ -84,8 +82,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(${HDF5_TEST_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}") target_compile_definitions(${HDF5_TEST_LIBSH_TARGET} - PUBLIC - "H5_BUILT_AS_DYNAMIC_LIB" + PUBLIC "H5_BUILT_AS_DYNAMIC_LIB" PRIVATE "H5_TEST_EXPRESS_LEVEL_DEFAULT=${H5_TEST_EXPRESS_LEVEL_DEFAULT}" "${HDF5_TEST_COMPILE_DEFS_PRIVATE}" @@ -105,10 +102,8 @@ if (BUILD_SHARED_LIBS) INSTALL_TARGET_PDB (${HDF5_TEST_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} libraries) install ( - TARGETS - ${HDF5_TEST_LIBSH_TARGET} - EXPORT - ${HDF5_EXPORTED_TARGETS} + TARGETS ${HDF5_TEST_LIBSH_TARGET} + EXPORT ${HDF5_EXPORTED_TARGETS} LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT libraries ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT libraries RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT libraries @@ -150,9 +145,9 @@ if (BUILD_SHARED_LIBS) ) foreach (plugin_name ${FILTER_PLUGINS_FOR_DIR1}) - set (HDF5_TEST_PLUGIN_CORENAME "${plugin_name}") - set (HDF5_TEST_PLUGIN_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_PLUGIN_CORENAME}") - set (HDF5_TEST_PLUGIN_TARGET ${HDF5_TEST_PLUGIN_CORENAME}) + set (HDF5_TEST_PLUGIN_CORENAME "${plugin_name}") + set (HDF5_TEST_PLUGIN_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_PLUGIN_CORENAME}") + set (HDF5_TEST_PLUGIN_TARGET ${HDF5_TEST_PLUGIN_CORENAME}) add_library (${HDF5_TEST_PLUGIN_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${plugin_name}.c) target_include_directories (${HDF5_TEST_PLUGIN_TARGET} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") @@ -182,9 +177,9 @@ if (BUILD_SHARED_LIBS) endforeach () foreach (plugin_name ${FILTER_PLUGINS_FOR_DIR2}) - set (HDF5_TEST_PLUGIN_CORENAME "${plugin_name}") - set (HDF5_TEST_PLUGIN_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_PLUGIN_CORENAME}") - set (HDF5_TEST_PLUGIN_TARGET ${HDF5_TEST_PLUGIN_CORENAME}) + set (HDF5_TEST_PLUGIN_CORENAME "${plugin_name}") + set (HDF5_TEST_PLUGIN_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_PLUGIN_CORENAME}") + set (HDF5_TEST_PLUGIN_TARGET ${HDF5_TEST_PLUGIN_CORENAME}) add_library (${HDF5_TEST_PLUGIN_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${plugin_name}.c) target_include_directories (${HDF5_TEST_PLUGIN_TARGET} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") @@ -226,9 +221,9 @@ if (BUILD_SHARED_LIBS) ) foreach (vfd_lib ${VFD_PLUGIN_LIBS}) - set (HDF5_VFD_PLUGIN_LIB_CORENAME "${vfd_lib}") - set (HDF5_VFD_PLUGIN_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_VFD_PLUGIN_LIB_CORENAME}") - set (HDF5_VFD_PLUGIN_LIB_TARGET ${HDF5_VFD_PLUGIN_LIB_CORENAME}) + set (HDF5_VFD_PLUGIN_LIB_CORENAME "${vfd_lib}") + set (HDF5_VFD_PLUGIN_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_VFD_PLUGIN_LIB_CORENAME}") + set (HDF5_VFD_PLUGIN_LIB_TARGET ${HDF5_VFD_PLUGIN_LIB_CORENAME}) add_library (${HDF5_VFD_PLUGIN_LIB_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${vfd_lib}.c) target_include_directories (${HDF5_VFD_PLUGIN_LIB_TARGET} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") @@ -270,9 +265,9 @@ if (BUILD_SHARED_LIBS) ) foreach (vol_lib ${VOL_PLUGIN_LIBS}) - set (HDF5_VOL_PLUGIN_LIB_CORENAME "${vol_lib}") - set (HDF5_VOL_PLUGIN_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_VOL_PLUGIN_LIB_CORENAME}") - set (HDF5_VOL_PLUGIN_LIB_TARGET ${HDF5_VOL_PLUGIN_LIB_CORENAME}) + set (HDF5_VOL_PLUGIN_LIB_CORENAME "${vol_lib}") + set (HDF5_VOL_PLUGIN_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_VOL_PLUGIN_LIB_CORENAME}") + set (HDF5_VOL_PLUGIN_LIB_TARGET ${HDF5_VOL_PLUGIN_LIB_CORENAME}) add_library (${HDF5_VOL_PLUGIN_LIB_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${vol_lib}.c) target_include_directories (${HDF5_VOL_PLUGIN_LIB_TARGET} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") @@ -572,9 +567,7 @@ if (NOT BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (ttsafe STATIC) target_link_libraries (ttsafe PRIVATE ${HDF5_TEST_LIB_TARGET}) if (NOT WIN32) - target_link_libraries (ttsafe - PRIVATE "$<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads>" - ) + target_link_libraries (ttsafe PRIVATE "$<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads>") endif () else () TARGET_C_PROPERTIES (ttsafe SHARED) @@ -599,9 +592,7 @@ if (NOT BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (thread_id STATIC) target_link_libraries (thread_id PRIVATE ${HDF5_TEST_LIB_TARGET}) if (NOT WIN32) - target_link_libraries (thread_id - PRIVATE "$<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads>" - ) + target_link_libraries (thread_id PRIVATE "$<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads>") endif () else () TARGET_C_PROPERTIES (thread_id SHARED) @@ -660,8 +651,7 @@ endforeach () #-- Adding test for libinfo set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake) -file (WRITE ${GREP_RUNNER} - "file (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\") +file (WRITE ${GREP_RUNNER} "file (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\") if (NOT TEST_RESULT) message (FATAL_ERROR \"Failed: The output: \${TEST_RESULT} of \${TEST_PROGRAM} did not contain SUMMARY OF THE HDF5 CONFIGURATION\") else () diff --git a/test/CMakePassthroughVOLTests.cmake b/test/CMakePassthroughVOLTests.cmake index 853e4b3..fbff51a 100644 --- a/test/CMakePassthroughVOLTests.cmake +++ b/test/CMakePassthroughVOLTests.cmake @@ -107,10 +107,14 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname} ) + if ("VOL-${volname}-${voltest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VOL-${volname}-${voltest} PROPERTIES DISABLED true) + endif () else () add_test (NAME VOL-${volname}-${voltest} COMMAND ${CMAKE_COMMAND} -E echo "SKIP VOL-${volname}-${voltest}" ) + set_tests_properties (VOL-${volname}-${voltest} PROPERTIES DISABLED true) endif () else () add_test (NAME VOL-${volname}-${voltest} @@ -128,6 +132,9 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname} ) + if ("VOL-${volname}-${voltest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VOL-${volname}-${voltest} PROPERTIES DISABLED true) + endif () endif () else () add_test (NAME VOL-${volname}-${voltest} @@ -145,6 +152,9 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname} ) + if ("VOL-${volname}-${voltest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VOL-${volname}-${voltest} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -165,6 +175,9 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname} ) + if ("VOL-${volname}-${voltest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VOL-${volname}-${voltest} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_VOL_TEST volname volinfo resultcode) @@ -202,6 +215,9 @@ add_custom_target(HDF5_VOLTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname} ) + if ("VOL-${volname}-fheap" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VOL-${volname}-fheap PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index cab01f6..385d2c0 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -215,18 +215,27 @@ set_tests_properties (H5TEST-testhdf5-base PROPERTIES ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-testhdf5-base" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-testhdf5-base PROPERTIES DISABLED true) +endif () add_test (NAME H5TEST-testhdf5-file COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5> -o file) set_tests_properties (H5TEST-testhdf5-file PROPERTIES FIXTURES_REQUIRED clear_testhdf5 ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-testhdf5-file" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-testhdf5-file PROPERTIES DISABLED true) +endif () add_test (NAME H5TEST-testhdf5-select COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf5> -o select) set_tests_properties (H5TEST-testhdf5-select PROPERTIES FIXTURES_REQUIRED clear_testhdf5 ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-testhdf5-select" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-testhdf5-select PROPERTIES DISABLED true) +endif () ############################################################################## ############################################################################## @@ -367,6 +376,9 @@ foreach (h5_test ${H5_TESTS}) WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) endif () + if ("H5TEST-${h5_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-${h5_test} PROPERTIES DISABLED true) + endif () endif () endforeach () @@ -412,6 +424,9 @@ if (NOT CYGWIN) WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) set_tests_properties (H5TEST-cache PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT}) + if ("H5TEST-cache" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-cache PROPERTIES DISABLED true) + endif () endif () if (TEST_CACHE_IMAGE) @@ -428,12 +443,15 @@ if (TEST_CACHE_IMAGE) WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) set_tests_properties (H5TEST-cache_image-clean-objects PROPERTIES FIXTURES_CLEANUP clear_cache_image) - add_test (NAME H5TEST_cache_image COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cache_image>) + add_test (NAME H5TEST-cache_image COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:cache_image>) set_tests_properties (H5TEST-cache_image PROPERTIES FIXTURES_REQUIRED clear_cache_image ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) + if ("H5TEST-cache_image" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-cache_image PROPERTIES DISABLED true) + endif () endif () #-- Adding test for external_env @@ -481,6 +499,9 @@ set_tests_properties (H5TEST-external_env PROPERTIES ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-external_env" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-external_env PROPERTIES DISABLED true) +endif () #-- Adding test for vds_env add_test ( @@ -513,6 +534,9 @@ set_tests_properties (H5TEST-vds_env PROPERTIES ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-vds_env" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-vds_env PROPERTIES DISABLED true) +endif () #-- Adding test for flush1/2 set (FLUSH_CLEANFILES @@ -554,6 +578,9 @@ set_tests_properties (H5TEST-flush1 PROPERTIES ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-flush1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-flush1 PROPERTIES DISABLED true) +endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5TEST-flush2 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:flush2>) else () @@ -572,6 +599,9 @@ set_tests_properties (H5TEST-flush2 PROPERTIES FIXTURES_REQUIRED clear_flush DEPENDS H5TEST-flush1 ) +if ("H5TEST-flush2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-flush2 PROPERTIES DISABLED true) +endif () #-- Adding test for tcheck_version add_test (NAME H5TEST-tcheck_version-major COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:tcheck_version> "-tM") @@ -579,17 +609,26 @@ set_tests_properties (H5TEST-tcheck_version-major PROPERTIES WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST WILL_FAIL "true" ) +if ("H5TEST-tcheck_version-major" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-tcheck_version-major PROPERTIES DISABLED true) +endif () add_test (NAME H5TEST-tcheck_version-minor COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:tcheck_version> "-tm") set_tests_properties (H5TEST-tcheck_version-minor PROPERTIES WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST WILL_FAIL "true" ) +if ("H5TEST-tcheck_version-minor" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-tcheck_version-minor PROPERTIES DISABLED true) +endif () # release + 1 should pass on non-develop branches add_test (NAME H5TEST-tcheck_version-release COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:tcheck_version> "-tr") set_tests_properties (H5TEST-tcheck_version-release PROPERTIES WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST WILL_FAIL "true" ) +if ("H5TEST-tcheck_version-release" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-tcheck_version-release PROPERTIES DISABLED true) +endif () ############################################################################## ############################################################################## @@ -642,6 +681,9 @@ set_tests_properties (H5TEST-filenotclosed PROPERTIES ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-filenotclosed" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-filenotclosed PROPERTIES DISABLED true) +endif () #-- Adding test for del_many_dense_attrs add_test ( @@ -662,6 +704,9 @@ set_tests_properties (H5TEST-del_many_dense_attrs PROPERTIES ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-del_many_dense_attrs" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-del_many_dense_attrs PROPERTIES DISABLED true) +endif () #-- Adding test for err_compat if (HDF5_ENABLE_DEPRECATED_SYMBOLS AND NOT MINGW) @@ -699,6 +744,9 @@ else () WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) endif () +if ("H5TEST-err_compat" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-err_compat PROPERTIES DISABLED true) +endif () #-- Adding test for error_test if (DEFAULT_API_VERSION MATCHES "v16" OR MINGW) @@ -744,6 +792,9 @@ else () WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) endif () +if ("H5TEST-error_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-error_test PROPERTIES DISABLED true) +endif () #-- Adding test for links_env add_test (NAME H5TEST-links_env-clear-objects @@ -785,6 +836,9 @@ set_tests_properties (H5TEST-links_env PROPERTIES ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5_EXT_PREFIX=.:tmp_links_env" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) +if ("H5TEST-links_env" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-links_env PROPERTIES DISABLED true) +endif () if (NOT BUILD_SHARED_LIBS) #-- Adding test for libinfo @@ -799,6 +853,9 @@ else () WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) endif () +if ("H5TEST-testlibinfo" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-testlibinfo PROPERTIES DISABLED true) +endif () ############################################################################## ### F I L T E R P L U G I N T E S T S @@ -817,6 +874,9 @@ if (BUILD_SHARED_LIBS) ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/filter_plugin_dir1${CMAKE_SEP}${CMAKE_BINARY_DIR}/filter_plugin_dir2;srcdir=${HDF5_TEST_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR} ) + if ("H5PLUGIN-filter_plugin" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5PLUGIN-filter_plugin PROPERTIES DISABLED true) + endif () endif () option (TEST_SHELL_SCRIPTS "Enable shell script tests" ON) @@ -872,6 +932,9 @@ if (ENABLE_EXTENDED_TESTS) ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST/flushrefresh_test" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST/flushrefresh_test ) + if ("H5TEST-testflushrefresh" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5TEST-testflushrefresh PROPERTIES DISABLED true) + endif () else () message (STATUS "Cannot execute TEST flushrefresh - perl not found") endif () @@ -910,6 +973,9 @@ if (BUILD_SHARED_LIBS) ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/null_vol_plugin_dir;srcdir=${HDF5_TEST_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR} ) + if ("H5PLUGIN-vol_plugin" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5PLUGIN-vol_plugin PROPERTIES DISABLED true) + endif () endif () if (HDF5_TEST_PASSTHROUGH_VOL) diff --git a/test/CMakeVFDTests.cmake b/test/CMakeVFDTests.cmake index ed7bd86..f2466ba 100644 --- a/test/CMakeVFDTests.cmake +++ b/test/CMakeVFDTests.cmake @@ -125,10 +125,14 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname} ) + if ("VFD-${vfdname}-${vfdtest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES DISABLED true) + endif () else () add_test (NAME VFD-${vfdname}-${vfdtest} COMMAND ${CMAKE_COMMAND} -E echo "SKIP VFD-${vfdname}-${vfdtest}" ) + set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES DISABLED true) endif () else () add_test (NAME VFD-${vfdname}-${vfdtest} @@ -146,6 +150,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname} ) + if ("VFD-${vfdname}-${vfdtest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES DISABLED true) + endif () endif () else () add_test (NAME VFD-${vfdname}-${vfdtest} @@ -163,6 +170,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname} ) + if ("VFD-${vfdname}-${vfdtest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -183,6 +193,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname} ) + if ("VFD-${vfdname}-${vfdtest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VFD-${vfdname}-${vfdtest} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -228,6 +241,9 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname} ) + if ("VFD-${vfdname}-fheap" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (VFD-${vfdname}-fheap PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -253,4 +269,7 @@ add_custom_target(HDF5_VFDTEST_LIB_files ALL COMMENT "Copying files needed by HD ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/null_vfd_plugin_dir;srcdir=${HDF5_TEST_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR} ) + if ("H5PLUGIN-vfd_plugin" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5PLUGIN-vfd_plugin PROPERTIES DISABLED true) + endif () endif () diff --git a/test/ShellTests.cmake b/test/ShellTests.cmake index 140da6f..118f301 100644 --- a/test/ShellTests.cmake +++ b/test/ShellTests.cmake @@ -104,20 +104,32 @@ elseif (UNIX) ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) + if ("H5SHELL-test_flush_refresh" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5SHELL-test_flush_refresh PROPERTIES DISABLED true) + endif () add_test (H5SHELL-test_use_cases ${SH_PROGRAM} ${HDF5_TEST_BINARY_DIR}/H5TEST/test_use_cases.sh) set_tests_properties (H5SHELL-test_use_cases PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) + if ("H5SHELL-test_use_cases" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5SHELL-test_use_cases PROPERTIES DISABLED true) + endif () add_test (H5SHELL-test_swmr ${SH_PROGRAM} ${HDF5_TEST_BINARY_DIR}/H5TEST/test_swmr.sh) set_tests_properties (H5SHELL-test_swmr PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) + if ("H5SHELL-test_swmr" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5SHELL-test_swmr PROPERTIES DISABLED true) + endif () add_test (H5SHELL-test_vds_swmr ${SH_PROGRAM} ${HDF5_TEST_BINARY_DIR}/H5TEST/test_vds_swmr.sh) set_tests_properties (H5SHELL-test_vds_swmr PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST ) + if ("H5SHELL-test_vds_swmr" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5SHELL-test_vds_swmr PROPERTIES DISABLED true) + endif () endif () endif () diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index dfdde59..36a97ee 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -55,6 +55,9 @@ set_tests_properties (MPI_TEST_testphdf5 PROPERTIES ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR} ) +if ("MPI_TEST_testphdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_testphdf5 PROPERTIES DISABLED true) +endif () if (last_test) set_tests_properties (MPI_TEST_testphdf5 PROPERTIES DEPENDS ${last_test}) endif () @@ -68,6 +71,9 @@ foreach (skiptest ${SKIP_tests}) ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR} ) + if ("MPI_TEST_testphdf5_${skiptest}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES DISABLED true) + endif () if (last_test) set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES DEPENDS ${last_test}) endif () @@ -131,6 +137,9 @@ foreach (h5_testp ${H5P_TESTS}) ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}" WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR} ) + if ("MPI_TEST_${h5_testp}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_${h5_testp} PROPERTIES DISABLED true) + endif () if (last_test) set_tests_properties (MPI_TEST_${h5_testp} PROPERTIES DEPENDS ${last_test}) endif () diff --git a/testpar/CMakeVFDTests.cmake b/testpar/CMakeVFDTests.cmake index d630015..cdec5f7 100644 --- a/testpar/CMakeVFDTests.cmake +++ b/testpar/CMakeVFDTests.cmake @@ -47,6 +47,9 @@ macro (ADD_VFD_TEST vfdname resultcode) ENVIRONMENT "srcdir=${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}" WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname} ) + if ("MPI_TEST_VFD-${vfdname}-${h5_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_VFD-${vfdname}-${h5_test} PROPERTIES DISABLED true) + endif () endif () endforeach () if (NOT "t_pflush1" IN_LIST H5P_VFD_${vfdname}_TESTS_SKIP) diff --git a/tools/libtest/CMakeTests.cmake b/tools/libtest/CMakeTests.cmake index 79810c4..b8d63d3 100644 --- a/tools/libtest/CMakeTests.cmake +++ b/tools/libtest/CMakeTests.cmake @@ -28,6 +28,9 @@ if (NOT "${resultcode}" STREQUAL "0") set_tests_properties (H5LIBTEST-${resultfile} PROPERTIES WILL_FAIL "true") endif () + if ("H5LIBTEST-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LIBTEST-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake index e443827..fb02d81 100644 --- a/tools/test/h5copy/CMakeTests.cmake +++ b/tools/test/h5copy/CMakeTests.cmake @@ -71,6 +71,9 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -f ${fparam} -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY_F-${testname} PROPERTIES DEPENDS H5COPY_F-${testname}-clear-objects) + if ("H5COPY_F-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_F-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") @@ -82,6 +85,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY_F-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY_F-${testname}-clean-objects @@ -106,6 +112,9 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY-${testname} PROPERTIES DEPENDS H5COPY-${testname}-clear-objects) + if ("H5COPY-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") @@ -117,6 +126,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY-${testname}-clean-objects @@ -135,7 +147,7 @@ NAME H5COPY-${testname}-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${testname}-${skipresultfile} ${ARGN}" ) - set_property(TEST H5COPY-${testname}-${skipresultfile} PROPERTY DISABLED) + set_property(TEST H5COPY-${testname}-${skipresultfile} PROPERTY DISABLED true) endif () endmacro () @@ -151,12 +163,18 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam} ) set_tests_properties (H5COPY-${testname}-prefill PROPERTIES DEPENDS H5COPY-${testname}-clear-objects) + if ("" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties ( PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY-${testname} PROPERTIES DEPENDS H5COPY-${testname}-prefill) + if ("H5COPY-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") add_test ( @@ -167,6 +185,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY-${testname}-clean-objects @@ -191,12 +212,18 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${pfile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam} ) set_tests_properties (H5COPY_SAME-${testname}-prefill PROPERTIES DEPENDS H5COPY_SAME-${testname}-clear-objects) + if ("H5COPY_SAME-${testname}-prefill" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_SAME-${testname}-prefill PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_SAME-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5copy${tgt_file_ext}> -i ./testfiles/${testname}.out.h5 -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN} ) set_tests_properties (H5COPY_SAME-${testname} PROPERTIES DEPENDS H5COPY_SAME-${testname}-prefill) + if ("H5COPY_SAME-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_SAME-${testname} PROPERTIES DISABLED true) + endif () # resultcode=2 will cause the test to skip the diff test if (NOT "${resultcode}" STREQUAL "2") add_test ( @@ -207,6 +234,9 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES WILL_FAIL "true") endif () + if ("H5COPY_SAME-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5COPY_SAME-${testname}-clean-objects @@ -235,7 +265,6 @@ if ("${resultcode}" STREQUAL "1") set_tests_properties (H5COPY-CMP-${testname} PROPERTIES WILL_FAIL "true") endif () - set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DEPENDS H5COPY-CMP-${testname}-clear-objects) else () add_test ( NAME H5COPY-CMP-${testname} @@ -251,7 +280,10 @@ -D "TEST_MASK=true" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) - set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DEPENDS H5COPY-CMP-${testname}-clear-objects) + endif () + set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DEPENDS H5COPY-CMP-${testname}-clear-objects) + if ("H5COPY-CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DISABLED true) endif () add_test ( NAME H5COPY-CMP-${testname}-clean-objects @@ -303,6 +335,9 @@ ) endif () set_tests_properties (H5COPY_UD-${testname} PROPERTIES DEPENDS H5COPY_UD-${testname}-clear-objects) + if ("H5COPY_UD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD-${testname}-DIFF COMMAND "${CMAKE_COMMAND}" @@ -320,6 +355,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (H5COPY_UD-${testname}-DIFF PROPERTIES DEPENDS H5COPY_UD-${testname}) + if ("H5COPY_UD-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD-${testname}-DIFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}.out.h5 @@ -373,6 +411,9 @@ ) endif () set_tests_properties (H5COPY_UD_ERR-${testname} PROPERTIES DEPENDS H5COPY_UD_ERR-${testname}-clear-objects) + if ("H5COPY_UD_ERR-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD_ERR-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD_ERR-${testname}-DIFF COMMAND "${CMAKE_COMMAND}" @@ -390,6 +431,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (H5COPY_UD_ERR-${testname}-DIFF PROPERTIES DEPENDS H5COPY_UD_ERR-${testname}) + if ("H5COPY_UD_ERR-${testname}-DIFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY_UD_ERR-${testname}-DIFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5COPY_UD_ERR-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/${testname}_ERR.out.h5 @@ -422,6 +466,9 @@ set_tests_properties (H5COPY-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" ) + if ("H5COPY-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index d89df46..f993f4b 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -437,6 +437,9 @@ set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5DIFF-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DIFF-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_PH5_TEST resultfile resultcode) @@ -469,6 +472,9 @@ set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/PAR/testfiles" ) + if ("MPI_TEST_H5DIFF-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (MPI_TEST_H5DIFF-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_UD_TEST testname resultcode resultfile) @@ -508,6 +514,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5DIFF_UD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index 8cc9a52..e997aa8 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -460,6 +460,9 @@ set_tests_properties (H5DUMP-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${testname} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype) @@ -469,7 +472,7 @@ NAME H5DUMP-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile} ${ARGN}" ) - set_property(TEST H5DUMP-${skipresultfile} PROPERTY DISABLED) + set_property(TEST H5DUMP-${skipresultfile} PROPERTY DISABLED true) endif () else () ADD_H5_TEST (${skipresultfile} ${skipresultcode} ${ARGN}) @@ -503,6 +506,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_TEST_N resultfile resultcode) @@ -521,7 +527,6 @@ set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WILL_FAIL "true") endif () set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES - DEPENDS H5DUMP-N-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) else () @@ -541,6 +546,9 @@ set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES DEPENDS H5DUMP-N-${resultfile}-clear-objects ) + if ("H5DUMP-N-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-N-${resultfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -568,7 +576,6 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true") endif () set_tests_properties (H5DUMP-${resultfile} PROPERTIES - DEPENDS H5DUMP-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) else () @@ -587,6 +594,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS H5DUMP-${resultfile}-clear-objects ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-${resultfile}-output-cmp COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp @@ -596,6 +606,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile}) + if ("H5DUMP-${resultfile}-output-cmp" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5DUMP-${resultfile}-clean-objects @@ -652,6 +665,9 @@ DEPENDS H5DUMP-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-${resultfile}-output-cmp COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp @@ -668,6 +684,9 @@ DEPENDS H5DUMP-${resultfile}-output-cmp WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}-output-cmp-ddl" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5DUMP-${resultfile}-clean-objects @@ -706,6 +725,9 @@ DEPENDS H5DUMP-output-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-output-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-output-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-output-cmp-${resultfile} COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp @@ -714,6 +736,9 @@ DEPENDS H5DUMP-output-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-output-cmp-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-output-${resultfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -744,6 +769,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -764,6 +792,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -785,6 +816,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -808,6 +842,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -836,6 +873,9 @@ set_tests_properties (H5DUMP-BIN_EXPORT-${conffile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-BIN_EXPORT-${conffile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-BIN_EXPORT-${conffile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-BIN_EXPORT-${conffile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -876,16 +916,25 @@ DEPENDS H5DUMP-IMPORT-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-IMPORT-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-IMPORT-${resultfile} PROPERTIES DISABLED true) + endif () add_test (NAME H5DUMP-IMPORT-h5import-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5import${tgt_file_ext}> ${resultfile}.bin -c ${conffile}.out -o ${resultfile}.h5) set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-IMPORT-h5import-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES DISABLED true) + endif () add_test (NAME H5DUMP-IMPORT-h5diff-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${testfile} ${resultfile}.h5 /integer /integer) set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-h5import-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP-IMPORT-h5diff-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5DUMP-IMPORT-${resultfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -919,6 +968,9 @@ set_tests_properties (H5DUMP_UD-${testname}-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std" ) + if ("H5DUMP_UD-${testname}-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_UD-${testname}-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake index 118b314..3104846 100644 --- a/tools/test/h5dump/CMakeTestsPBITS.cmake +++ b/tools/test/h5dump/CMakeTestsPBITS.cmake @@ -139,6 +139,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake index c910acd..1589e70 100644 --- a/tools/test/h5dump/CMakeTestsVDS.cmake +++ b/tools/test/h5dump/CMakeTestsVDS.cmake @@ -130,6 +130,9 @@ set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds" ) + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode) @@ -162,6 +165,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5DUMP_PREFIX-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_PREFIX-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_VDS_LAYOUT resultfile resultcode) @@ -189,6 +195,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5DUMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake index d78e738..ae7cd8f 100644 --- a/tools/test/h5dump/CMakeTestsXML.cmake +++ b/tools/test/h5dump/CMakeTestsXML.cmake @@ -172,7 +172,7 @@ NAME H5DUMP_XML-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile}.xml --xml ${ARGN}" ) - set_property(TEST H5DUMP_XML-${skipresultfile} PROPERTY DISABLED) + set_property(TEST H5DUMP_XML-${skipresultfile} PROPERTY DISABLED true) endif () else () ADD_XML_H5_TEST (${skipresultfile} ${skipresultcode} ${ARGN}) @@ -202,6 +202,9 @@ set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml" ) + if ("H5DUMP_XML-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index b303032..0118725 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -55,6 +55,9 @@ macro (ADD_VFD_H5DUMP_TEST vfdname resultfile resultcode) -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (H5DUMP_VFD-${vfdname}-${resultfile}-h5dump PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT}) + if ("H5DUMP_VFD-${vfdname}-${resultfile}-h5dump" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5DUMP_VFD-${vfdname}-${resultfile}-h5dump PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake index ab14a8c..ecf16bf 100644 --- a/tools/test/h5format_convert/CMakeTests.cmake +++ b/tools/test/h5format_convert/CMakeTests.cmake @@ -105,46 +105,52 @@ COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}-tmp.h5 ) if (${testfile}) - add_test ( - NAME H5FC-${testname}-${testfile}-tmpfile - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5 - ) - set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES - DEPENDS H5FC-${testname}-${testfile}-clear-objects - ) - add_test ( - NAME H5FC-${testname}-${testfile} - COMMAND "${CMAKE_COMMAND}" - -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" - -D "TEST_ARGS=${ARGN};${testname}-tmp.h5" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" - -D "TEST_OUTPUT=${testname}-${testfile}.out" - -D "TEST_EXPECT=${resultcode}" - -D "TEST_REFERENCE=${resultfile}" - -D "TEST_ERRREF=${resultfile}.err" - -P "${HDF_RESOURCES_DIR}/runTest.cmake" - ) - set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES - DEPENDS H5FC-${testname}-${testfile}-tmpfile - ) - set (last_test "H5FC-${testname}-${testfile}") + add_test ( + NAME H5FC-${testname}-${testfile}-tmpfile + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/${testname}-tmp.h5 + ) + set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES + DEPENDS H5FC-${testname}-${testfile}-clear-objects + ) + add_test ( + NAME H5FC-${testname}-${testfile} + COMMAND "${CMAKE_COMMAND}" + -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" + -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" + -D "TEST_ARGS=${ARGN};${testname}-tmp.h5" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" + -D "TEST_OUTPUT=${testname}-${testfile}.out" + -D "TEST_EXPECT=${resultcode}" + -D "TEST_REFERENCE=${resultfile}" + -D "TEST_ERRREF=${resultfile}.err" + -P "${HDF_RESOURCES_DIR}/runTest.cmake" + ) + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES + DEPENDS H5FC-${testname}-${testfile}-tmpfile + ) + if ("H5FC-${testname}-${testfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DISABLED true) + endif () + set (last_test "H5FC-${testname}-${testfile}") else () - add_test ( - NAME H5FC-${testname}-${testfile}-NA - COMMAND "${CMAKE_COMMAND}" - -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" - -D "TEST_ARGS=${ARGN}" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" - -D "TEST_OUTPUT=${testname}-${testfile}.out" - -D "TEST_EXPECT=${resultcode}" - -D "TEST_REFERENCE=${resultfile}" - -P "${HDF_RESOURCES_DIR}/runTest.cmake" - ) - set_tests_properties (H5FC-${testname}-${testfile}-NA PROPERTIES - DEPENDS H5FC-${testname}-${testfile}-tmpfile - ) + add_test ( + NAME H5FC-${testname}-${testfile}-NA + COMMAND "${CMAKE_COMMAND}" + -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" + -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert${tgt_file_ext}>" + -D "TEST_ARGS=${ARGN}" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" + -D "TEST_OUTPUT=${testname}-${testfile}.out" + -D "TEST_EXPECT=${resultcode}" + -D "TEST_REFERENCE=${resultfile}" + -P "${HDF_RESOURCES_DIR}/runTest.cmake" + ) + set_tests_properties (H5FC-${testname}-${testfile}-NA PROPERTIES + DEPENDS H5FC-${testname}-${testfile}-tmpfile + ) + if ("H5FC-${testname}-${testfile}-NA" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile}-NA PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5FC-${testname}-${testfile}-clean-objects @@ -185,6 +191,9 @@ set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS H5FC-${testname}-${testfile}-tmpfile ) + if ("H5FC-${testname}-${testfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC-${testname}-${testfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}-tmp.h5 @@ -225,6 +234,9 @@ set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS H5FC-${testname}-${testfile}-tmpfile ) + if ("H5FC-${testname}-${testfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC-${testname}-${testfile}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/${testname}-tmp.h5 @@ -278,6 +290,9 @@ DEPENDS "H5FC-${testname}-tmpfile" FIXTURES_REQUIRED clear_H5FC-${testname} ) + if ("H5FC-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -292,6 +307,9 @@ DEPENDS "H5FC-${dependtest}" FIXTURES_REQUIRED clear_H5FC-${dependtest} ) + if ("H5FC_CHECK_IDX-${dependtest}-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_CHECK_IDX-${dependtest}-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -325,6 +343,9 @@ set_tests_properties (H5FC_TEST_CHECK_IDX-${testname} PROPERTIES DEPENDS "H5FC_TEST_CHECK_IDX-${testname}-tmpfile" ) + if ("H5FC_TEST_CHECK_IDX-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_TEST_CHECK_IDX-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_TEST_CHECK_IDX-${testname}-check COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5fc_chk_idx> ./testfiles/${testname}-tmp.h5 ${ARGN} @@ -332,6 +353,9 @@ set_tests_properties (H5FC_TEST_CHECK_IDX-${testname}-check PROPERTIES DEPENDS "H5FC_TEST_CHECK_IDX-${testname}" ) + if ("H5FC_TEST_CHECK_IDX-${testname}-check" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_TEST_CHECK_IDX-${testname}-check PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_TEST_CHECK_IDX-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -373,6 +397,9 @@ set_tests_properties (H5FC_H5DUMP_CHECK-${testname} PROPERTIES DEPENDS "H5FC_H5DUMP_CHECK-${testname}-tmpfile" ) + if ("H5FC_H5DUMP_CHECK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_H5DUMP_CHECK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_H5DUMP_CHECK-${testname}-dump COMMAND "${CMAKE_COMMAND}" @@ -388,6 +415,9 @@ set_tests_properties (H5FC_H5DUMP_CHECK-${testname}-dump PROPERTIES DEPENDS "H5FC_H5DUMP_CHECK-${testname}" ) + if ("H5FC_H5DUMP_CHECK-${testname}-dump" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5FC_H5DUMP_CHECK-${testname}-dump PROPERTIES DISABLED true) + endif () add_test ( NAME H5FC_H5DUMP_CHECK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake index c3bbd79..71c0421 100644 --- a/tools/test/h5import/CMakeTests.cmake +++ b/tools/test/h5import/CMakeTests.cmake @@ -118,6 +118,9 @@ DEPENDS H5IMPORT-${testname}-clear-objects FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-${testname} PROPERTIES DISABLED true) + endif () # If using memchecker skip macro based tests if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( @@ -138,6 +141,9 @@ DEPENDS H5IMPORT-${testname} FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-${testname}-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-${testname}-H5DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT-${testname}-H5DMP_CMP COMMAND "${CMAKE_COMMAND}" @@ -155,6 +161,9 @@ DEPENDS H5IMPORT-${testname}-H5DMP FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-${testname}-H5DMP_CMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -217,6 +226,9 @@ DEPENDS "H5IMPORT-DUMP-${testname}-clear-objects" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-DUMP-${testname}-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-DUMP-${testname}-H5DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT-DUMP-${testname} @@ -234,6 +246,9 @@ DEPENDS "H5IMPORT-DUMP-${testname}-H5DMP" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-DUMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-DUMP-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT-DUMP-${testname}-H5DFF @@ -252,6 +267,9 @@ DEPENDS "H5IMPORT-DUMP-${testname}" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT-DUMP-${testname}-H5DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -298,6 +316,9 @@ DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT_SUB-DUMP-${testname}-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT_SUB-DUMP-${testname}-H5IMP @@ -315,6 +336,9 @@ DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT_SUB-DUMP-${testname}-H5IMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5IMPORT_SUB-DUMP-${testname}-CMP COMMAND "${CMAKE_COMMAND}" @@ -331,6 +355,9 @@ DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP" FIXTURES_REQUIRED set_h5importtest ) + if ("H5IMPORT_SUB-DUMP-${testname}-CMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -352,7 +379,7 @@ NAME H5IMPORT-DUMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${testname} ${datasetname} ${testfile} --- DEFLATE filter not available" ) - set_property(TEST H5IMPORT-DUMP-${testname} PROPERTY DISABLED) + set_property(TEST H5IMPORT-DUMP-${testname} PROPERTY DISABLED true) endif () endmacro () diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake index eb6070e..d87899a 100644 --- a/tools/test/h5jam/CMakeTests.cmake +++ b/tools/test/h5jam/CMakeTests.cmake @@ -74,6 +74,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5JAM-${expectfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${expectfile} PROPERTIES DISABLED true) + endif () endmacro () # ============================================================ @@ -101,6 +104,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5JAM-UNJAM-${expectfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES DISABLED true) + endif () endmacro () macro (CHECKFILE testname testdepends expected actual) @@ -119,6 +125,9 @@ -D "TEST_SKIP_COMPARE=TRUE" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5JAM-${testname}-CHECKFILE-H5DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DISABLED true) + endif () set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS ${testdepends}) add_test ( NAME H5JAM-${testname}-CHECKFILE-H5DMP_CMP @@ -133,6 +142,9 @@ -D "TEST_REFERENCE=${actual}.new" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5JAM-${testname}-CHECKFILE-H5DMP_CMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP_CMP PROPERTIES DISABLED true) + endif () set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP_CMP PROPERTIES DEPENDS H5JAM-${testname}-CHECKFILE-H5DMP) endif () endmacro() @@ -184,6 +196,9 @@ set (compare_test "") endif () endif () + if ("H5JAM-${testname}-UNJAM" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-UNJAM PROPERTIES DISABLED true) + endif () if (${compare_test}) add_test ( NAME H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects @@ -208,6 +223,9 @@ -P "${HDF_RESOURCES_DIR}/userblockTest.cmake" ) set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}-UNJAM-CHECK_UB_1-clear-objects) + if ("H5JAM-${testname}-UNJAM-CHECK_UB_1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_UB_1 PROPERTIES DISABLED true) + endif () endif () add_test ( @@ -229,6 +247,9 @@ else () set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_NOUB PROPERTIES DEPENDS H5JAM-${testname}-UNJAM) endif () + if ("H5JAM-${testname}-UNJAM-CHECK_NOUB" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-UNJAM-CHECK_NOUB PROPERTIES DISABLED true) + endif () CHECKFILE (${testname} "H5JAM-${testname}-UNJAM-CHECK_NOUB" ${chkfile} ${outfile}) endif () @@ -242,6 +263,9 @@ ) endif () add_test (NAME H5JAM-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jam${tgt_file_ext}> -u testfiles/${jamfile} -i testfiles/${infile} -o ${outfile} ${ARGN}) + if ("H5JAM-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname} PROPERTIES DISABLED true) + endif () if (NOT HDF5_ENABLE_USING_MEMCHECKER) set_tests_properties (H5JAM-${testname} PROPERTIES DEPENDS H5JAM-${testname}-clear-objects) set (compare_test ${outfile}) @@ -273,6 +297,9 @@ -P "${HDF_RESOURCES_DIR}/userblockTest.cmake" ) set_tests_properties (H5JAM-${testname}-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}-CHECK_UB_1-clear-objects) + if ("H5JAM-${testname}-CHECK_UB_1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}-CHECK_UB_1 PROPERTIES DISABLED true) + endif () CHECKFILE (${testname} "H5JAM-${testname}-CHECK_UB_1" ${chkfile} ${outfile}) endif () endmacro () @@ -295,9 +322,15 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${chkfile} ${chkfile}.cpy.h5 ) set_tests_properties (H5JAM-${testname}_NONE_COPY PROPERTIES DEPENDS H5JAM-${testname}_NONE-SETUP) + if ("H5JAM-${testname}_NONE_COPY" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}_NONE_COPY PROPERTIES DISABLED true) + endif () add_test (NAME H5JAM-${testname}_NONE COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5jam${tgt_file_ext}> -u testfiles/${jamfile} -i ${chkfile} ${ARGN}) set_tests_properties (H5JAM-${testname}_NONE PROPERTIES DEPENDS H5JAM-${testname}_NONE_COPY) + if ("H5JAM-${testname}_NONE" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}_NONE PROPERTIES DISABLED true) + endif () set (compare_test ${chkfile}) set (compare_orig ${chkfile}.cpy.h5) @@ -328,6 +361,9 @@ -P "${HDF_RESOURCES_DIR}/userblockTest.cmake" ) set_tests_properties (H5JAM-${testname}_NONE-CHECK_UB_1 PROPERTIES DEPENDS H5JAM-${testname}_NONE-CHECK_UB_1-clear-objects) + if ("H5JAM-${testname}_NONE-CHECK_UB_1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5JAM-${testname}_NONE-CHECK_UB_1 PROPERTIES DISABLED true) + endif () CHECKFILE (${testname} "H5JAM-${testname}_NONE-CHECK_UB_1" ${infile} ${chkfile}) endif () endmacro () diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 14a7e5d..629f324 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -169,6 +169,9 @@ set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5LS-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_ERR_TEST resultfile resultcode) @@ -197,6 +200,9 @@ set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5LS-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_UD_TEST testname resultcode resultfile) @@ -219,6 +225,9 @@ set_tests_properties (H5LS_UD-${testname}-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5LS_UD-${testname}-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS_UD-${testname}-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake index 3718f64..9bf4042 100644 --- a/tools/test/h5ls/CMakeTestsVDS.cmake +++ b/tools/test/h5ls/CMakeTestsVDS.cmake @@ -103,6 +103,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5LS-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_VDS_PREFIX_TEST resultfile resultcode) @@ -132,6 +135,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () + if ("H5LS_PREFIX-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5LS_PREFIX-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake index 5c41254..3fb5d56 100644 --- a/tools/test/h5repack/CMakeTests.cmake +++ b/tools/test/h5repack/CMakeTests.cmake @@ -267,6 +267,9 @@ set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5REPACK-h5repack-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_TEST_OLD testname testtype testfile) @@ -276,7 +279,7 @@ NAME H5REPACK_OLD-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK_OLD-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_OLD-${testname} PROPERTY DISABLED true) else () add_test ( NAME H5REPACK_OLD-${testname}-clear-objects @@ -289,6 +292,9 @@ set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DEPENDS H5REPACK_OLD-${testname}-clear-objects ) + if ("H5REPACK_OLD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_OLD-${testname}_DFF COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile} @@ -296,6 +302,9 @@ set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES DEPENDS H5REPACK_OLD-${testname} ) + if ("H5REPACK_OLD-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_OLD-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -314,7 +323,7 @@ NAME H5REPACK-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -328,6 +337,9 @@ set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS H5REPACK-${testname}-clear-objects ) + if ("H5REPACK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK-${testname}_DFF COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile} @@ -335,6 +347,9 @@ set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DEPENDS H5REPACK-${testname} ) + if ("H5REPACK-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -352,7 +367,7 @@ NAME H5REPACK_CMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_CMP-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_CMP-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -385,6 +400,9 @@ set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS H5REPACK_CMP-${testname}-clear-objects ) + if ("H5REPACK_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DISABLED true) + endif () endif () add_test ( NAME H5REPACK_CMP-${testname}-clean-objects @@ -403,7 +421,7 @@ NAME H5REPACK_MASK-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_MASK-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_MASK-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -435,6 +453,9 @@ set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS H5REPACK_MASK-${testname}-clear-objects ) + if ("H5REPACK_MASK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_MASK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile} @@ -452,7 +473,7 @@ NAME H5REPACK_DMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -466,6 +487,9 @@ set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname}-clear-objects ) + if ("H5REPACK_DMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DISABLED true) + endif () if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( NAME H5REPACK_DMP-h5dump-${testname} @@ -482,6 +506,9 @@ set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname} ) + if ("H5REPACK_DMP-h5dump-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_DMP-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile} @@ -508,7 +535,7 @@ NAME H5REPACK_DMP-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_DMP-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -525,6 +552,9 @@ set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname}-clear-objects ) + if ("H5REPACK_DMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DISABLED true) + endif () if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( NAME H5REPACK_DMP-h5dump-${testname} @@ -541,6 +571,9 @@ set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_DMP-${testname}" ) + if ("H5REPACK_DMP-h5dump-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DISABLED true) + endif () endif () endif () endmacro () @@ -552,7 +585,7 @@ NAME H5REPACK_DIFF-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK_DIFF-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_DIFF-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -566,6 +599,9 @@ set_tests_properties (H5REPACK_DIFF-${testname} PROPERTIES DEPENDS H5REPACK_DIFF-${testname}-clear-objects ) + if ("H5REPACK_DIFF-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DIFF-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_DIFF-${testname}_DFF COMMAND "${CMAKE_COMMAND}" @@ -581,6 +617,9 @@ set_tests_properties (H5REPACK_DIFF-${testname}_DFF PROPERTIES DEPENDS H5REPACK_DIFF-${testname} ) + if ("H5REPACK_DIFF-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_DIFF-${testname}_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_DIFF-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -598,7 +637,7 @@ NAME H5REPACK_STAT-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}" ) - set_property(TEST H5REPACK_STAT-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_STAT-${testname} PROPERTY DISABLED true) endif () else () add_test ( @@ -612,6 +651,9 @@ set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES DEPENDS H5REPACK_STAT-${testname}-clear-objects ) + if ("H5REPACK_STAT-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES DISABLED true) + endif () if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( NAME H5REPACK_STAT-h5stat-${testname} @@ -628,6 +670,9 @@ set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES DEPENDS H5REPACK_STAT-${testname} ) + if ("H5REPACK_STAT-h5stat-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_STAT-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${statarg}.${resultfile} @@ -654,7 +699,7 @@ NAME H5REPACK_VERIFY_LAYOUT-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_VERIFY_LAYOUT-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_VERIFY_LAYOUT-${testname} PROPERTY DISABLED true) endif () else () if (NOT HDF5_ENABLE_USING_MEMCHECKER) @@ -669,6 +714,9 @@ set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects ) + if ("H5REPACK_VERIFY_LAYOUT-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT-${testname}_DFF COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile} @@ -676,6 +724,9 @@ set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname} ) + if ("H5REPACK_VERIFY_LAYOUT-${testname}_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES DISABLED true) + endif () if (NOT ${resultcode}) add_test ( NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP @@ -720,6 +771,9 @@ DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF ) endif () + if ("H5REPACK_VERIFY_LAYOUT-${testname}_DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -738,7 +792,7 @@ NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}" ) - set_property(TEST H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTY DISABLED true) endif () else () if (NOT HDF5_ENABLE_USING_MEMCHECKER) @@ -755,6 +809,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clear-objects ) + if ("H5REPACK_VERIFY_LAYOUT_VDS-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP COMMAND "${CMAKE_COMMAND}" @@ -771,6 +828,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname} ) + if ("H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -796,6 +856,9 @@ set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname}-clear-objects ) + if ("H5REPACK_VERIFY_SUPERBLOCK-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP COMMAND "${CMAKE_COMMAND}" @@ -812,6 +875,9 @@ set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_SUPERBLOCK-${testname} ) + if ("H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VERIFY_SUPERBLOCK-${testname}_DMP PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VERIFY_SUPERBLOCK-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -835,6 +901,9 @@ DEPENDS ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clear-objects WILL_FAIL "true" ) + if ("ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${testfile} @@ -859,6 +928,9 @@ set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DEPENDS H5REPACK_META-${testname}-clear-objects ) + if ("H5REPACK_META-${testname}_N" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}_N_DFF COMMAND "${CMAKE_COMMAND}" @@ -874,6 +946,9 @@ set_tests_properties (H5REPACK_META-${testname}_N_DFF PROPERTIES DEPENDS H5REPACK_META-${testname}_N ) + if ("H5REPACK_META-${testname}_N_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_N_DFF PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}_M COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5repack${tgt_file_ext}> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5 @@ -881,6 +956,9 @@ set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES DEPENDS H5REPACK_META-${testname}_N_DFF ) + if ("H5REPACK_META-${testname}_M" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}_M_DFF COMMAND "${CMAKE_COMMAND}" @@ -896,6 +974,9 @@ set_tests_properties (H5REPACK_META-${testname}_M_DFF PROPERTIES DEPENDS H5REPACK_META-${testname}_M ) + if ("H5REPACK_META-${testname}_M_DFF" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname}_M_DFF PROPERTIES DISABLED true) + endif () add_test (NAME H5REPACK_META-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles" @@ -907,6 +988,9 @@ set_tests_properties (H5REPACK_META-${testname} PROPERTIES DEPENDS H5REPACK_META-${testname}_M_DFF ) + if ("H5REPACK_META-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_META-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_META-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -944,6 +1028,9 @@ set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clear-objects ) + if ("H5REPACK_UD-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_UD-${testname}-h5dump COMMAND "${CMAKE_COMMAND}" @@ -962,6 +1049,9 @@ set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES DEPENDS H5REPACK_UD-${testname} ) + if ("H5REPACK_UD-${testname}-h5dump" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_UD-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/out-${testname}.${resultfile} @@ -983,7 +1073,7 @@ NAME H5REPACK_EXTERNAL-${testname} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}" ) - set_property(TEST H5REPACK_EXTERNAL-${testname} PROPERTY DISABLED) + set_property(TEST H5REPACK_EXTERNAL-${testname} PROPERTY DISABLED true) else () add_test ( NAME H5REPACK_EXTERNAL-${testname}-clear-objects @@ -1002,6 +1092,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}-clear-objects ) + if ("H5REPACK_EXTERNAL-${testname}_CPY" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_CPY PROPERTIES DISABLED true) + endif () # comparison of known files add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF1 @@ -1011,6 +1104,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_CPY ) + if ("H5REPACK_EXTERNAL-${testname}_DFF1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF1 PROPERTIES DISABLED true) + endif () # repack the external file to the repacked file add_test ( NAME H5REPACK_EXTERNAL-${testname} @@ -1020,6 +1116,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DFF1 ) + if ("H5REPACK_EXTERNAL-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname} PROPERTIES DISABLED true) + endif () # comparison of repacked file to known files add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF2 @@ -1029,6 +1128,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname} ) + if ("H5REPACK_EXTERNAL-${testname}_DFF2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF2 PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF3 COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5diff${tgt_file_ext}> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/h5repack_${testfile}_rp.h5 ${PROJECT_BINARY_DIR}/testfiles/h5repack_${testfile}_ex.h5 @@ -1037,6 +1139,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DFF2 ) + if ("H5REPACK_EXTERNAL-${testname}_DFF3" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF3 PROPERTIES DISABLED true) + endif () # invalidate external file by removing its first data file add_test ( NAME H5REPACK_EXTERNAL-${testname}_DATA_RMV @@ -1046,6 +1151,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DFF3 ) + if ("H5REPACK_EXTERNAL-${testname}_DATA_RMV" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DATA_RMV PROPERTIES DISABLED true) + endif () # verify comparison of repacked file to known file add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF4 @@ -1055,6 +1163,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5REPACK_EXTERNAL-${testname}_DATA_RMV ) + if ("H5REPACK_EXTERNAL-${testname}_DFF4" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF4 PROPERTIES DISABLED true) + endif () # verify comparison of repacked file to known external file fails add_test ( NAME H5REPACK_EXTERNAL-${testname}_DFF_FAIL @@ -1065,6 +1176,9 @@ DEPENDS H5REPACK_EXTERNAL-${testname}_DFF4 WILL_FAIL "true" ) + if ("H5REPACK_EXTERNAL-${testname}_DFF_FAIL" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_EXTERNAL-${testname}_DFF_FAIL PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_EXTERNAL-${testname}-clean-objects COMMAND ${CMAKE_COMMAND} -E remove h5repack_${testfile}_rp.h5 diff --git a/tools/test/h5repack/CMakeVFDTests.cmake b/tools/test/h5repack/CMakeVFDTests.cmake index b746d88..e992029 100644 --- a/tools/test/h5repack/CMakeVFDTests.cmake +++ b/tools/test/h5repack/CMakeVFDTests.cmake @@ -83,6 +83,9 @@ macro (ADD_VFD_TEST vfdname resultcode) DEPENDS H5REPACK_VFD-${vfdname}-h5repacktest-clear-objects TIMEOUT ${CTEST_SHORT_TIMEOUT} ) + if ("H5REPACK_VFD-${vfdname}-h5repacktest" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPACK_VFD-${vfdname}-h5repacktest PROPERTIES DISABLED true) + endif () add_test ( NAME H5REPACK_VFD-${vfdname}-h5repacktest-clean-objects COMMAND ${CMAKE_COMMAND} -E remove diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake index 9035eaf..2b47cd0 100644 --- a/tools/test/h5stat/CMakeTests.cmake +++ b/tools/test/h5stat/CMakeTests.cmake @@ -117,6 +117,9 @@ set_tests_properties (H5STAT-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" ) + if ("H5STAT-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5STAT-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () macro (ADD_H5_ERR_TEST resultfile resultcode) @@ -144,6 +147,9 @@ set_tests_properties (H5STAT-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" ) + if ("H5STAT-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5STAT-${resultfile} PROPERTIES DISABLED true) + endif () endmacro () ############################################################################## diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake index 2f3c62f..cfe237d 100644 --- a/tools/test/misc/CMakeTestsClear.cmake +++ b/tools/test/misc/CMakeTestsClear.cmake @@ -102,6 +102,9 @@ -D "TEST_REFERENCE=${resultfile}.ddl" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () if (last_test) set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test}) endif () @@ -124,6 +127,9 @@ -D "TEST_ERRREF=${resultfile}.err" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () if (last_test) set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test}) endif () @@ -160,6 +166,9 @@ set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname} ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -193,6 +202,9 @@ set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname} ) + if ("H5CLEAR_CMP-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -206,6 +218,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" WILL_FAIL "${resultcode}" ) + if ("H5CLEAR_RET-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_RET-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -238,6 +253,9 @@ set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_TEST-copy_${testname} ) + if ("H5CLEAR_FILESIZE_CMP-${testname}_before_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_before_size PROPERTIES DISABLED true) + endif () if (NOT ${incr_size} MATCHES "NONE") add_test ( NAME H5CLEAR_FILESIZE_INCR-${testname} @@ -254,6 +272,9 @@ WILL_FAIL "${resultcode}" DEPENDS H5CLEAR_FILESIZE_CMP-${testname}_before_size ) + if ("H5CLEAR_FILESIZE_INCR-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_INCR-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR_FILESIZE_CMP-${testname}_after_size COMMAND "${CMAKE_COMMAND}" @@ -269,6 +290,9 @@ set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_INCR-${testname} ) + if ("H5CLEAR_FILESIZE_CMP-${testname}_after_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_CMP-${testname}_after_size PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -286,6 +310,9 @@ set_tests_properties (H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} PROPERTIES DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-${testname}-clear-objects ) + if ("H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size COMMAND "${CMAKE_COMMAND}" @@ -301,6 +328,9 @@ set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_FAIL_TEST-copy_${testname} ) + if ("H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size PROPERTIES DISABLED true) + endif () if (NOT ${incr_size} MATCHES "NONE") add_test ( NAME H5CLEAR_FILESIZE_FAIL_INCR-${testname} @@ -316,6 +346,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5CLEAR_FILESIZE_FAIL_CMP-${testname}_before_size ) + if ("H5CLEAR_FILESIZE_FAIL_INCR-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_INCR-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size COMMAND "${CMAKE_COMMAND}" @@ -331,6 +364,9 @@ set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size PROPERTIES DEPENDS H5CLEAR_FILESIZE_FAIL_INCR-${testname} ) + if ("H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR_FILESIZE_FAIL_CMP-${testname}_after_size PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -353,6 +389,9 @@ WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" DEPENDS H5CLEAR-clr_open_chk-copy_${testname}.h5 ) + if ("H5CLEAR-clr_open_chk-${testname}_${resultcode}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR-clr_open_chk-${testname}_${resultcode} PROPERTIES DISABLED true) + endif () # After "h5clear" the file, the subsequent file open succeeds add_test ( @@ -363,6 +402,9 @@ DEPENDS H5CLEAR-clr_open_chk-${testname}_${resultcode} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5CLEAR-h5clr-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR-h5clr-${testname} PROPERTIES DISABLED true) + endif () add_test ( NAME H5CLEAR-clr_open_chk-${testname} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:clear_open_chk> ${testfile}.h5 @@ -371,6 +413,9 @@ DEPENDS H5CLEAR-h5clr-${testname} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5CLEAR-clr_open_chk-${testname}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5CLEAR-clr_open_chk-${testname} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake index 9e4f739..e583b7f 100644 --- a/tools/test/misc/CMakeTestsMkgrp.cmake +++ b/tools/test/misc/CMakeTestsMkgrp.cmake @@ -60,6 +60,9 @@ NAME H5MKGRP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5mkgrp${tgt_file_ext}> ${resultoption} ${resultfile}.h5 ${ARGN} ) + if ("H5MKGRP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DISABLED true) + endif () else () add_test ( NAME H5MKGRP-${resultfile}-clear-objects @@ -76,6 +79,9 @@ DEPENDS H5MKGRP-${resultfile}-clear-objects WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) + if ("H5MKGRP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP-${resultfile} PROPERTIES DISABLED true) + endif () add_test ( NAME H5MKGRP-${resultfile}-h5ls COMMAND "${CMAKE_COMMAND}" @@ -90,6 +96,9 @@ -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (H5MKGRP-${resultfile}-h5ls PROPERTIES DEPENDS H5MKGRP-${resultfile}) + if ("H5MKGRP-${resultfile}-h5ls" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP-${resultfile}-h5ls PROPERTIES DISABLED true) + endif () endif () endmacro () @@ -119,6 +128,9 @@ set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects ) + if ("H5MKGRP_CMP-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5MKGRP_CMP-${resultfile} PROPERTIES DISABLED true) + endif () endif () endmacro () diff --git a/tools/test/misc/CMakeTestsRepart.cmake b/tools/test/misc/CMakeTestsRepart.cmake index 764778e..81e8cc6 100644 --- a/tools/test/misc/CMakeTestsRepart.cmake +++ b/tools/test/misc/CMakeTestsRepart.cmake @@ -94,6 +94,9 @@ set_tests_properties (H5REPART-h5repart_20K PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_20K" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_20K PROPERTIES DISABLED true) + endif () # repartition family member size to 5 KB. add_test ( @@ -103,6 +106,9 @@ set_tests_properties (H5REPART-h5repart_5K PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_5K" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_5K PROPERTIES DISABLED true) + endif () # convert family file to sec2 file of 20,000 bytes add_test ( @@ -112,6 +118,9 @@ set_tests_properties (H5REPART-h5repart_single PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_single" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_single PROPERTIES DISABLED true) + endif () # convert family file to sec2 file of 20,000 bytes (old argument) add_test ( @@ -121,6 +130,9 @@ set_tests_properties (H5REPART-h5repart_sec2 PROPERTIES FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_sec2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_sec2 PROPERTIES DISABLED true) + endif () # test the output files repartitioned above. add_test ( @@ -131,6 +143,9 @@ DEPENDS "H5REPART-h5repart_20K;H5REPART-h5repart_5K;H5REPART-h5repart_single;H5REPART-h5repart_sec2" FIXTURES_REQUIRED clear_testrepart ) + if ("H5REPART-h5repart_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5REPART-h5repart_test PROPERTIES DISABLED true) + endif () set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5repart_test diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake index 2dea619..714713e 100644 --- a/tools/test/perform/CMakeTests.cmake +++ b/tools/test/perform/CMakeTests.cmake @@ -69,6 +69,9 @@ if (HDF5_TEST_SERIAL) TIMEOUT ${CTEST_VERY_LONG_TIMEOUT} FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_h5perf_serial" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_h5perf_serial PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_chunk COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:chunk>) @@ -88,6 +91,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_chunk PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_chunk" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_chunk PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_iopipe COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:iopipe>) @@ -107,6 +113,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_iopipe PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_iopipe" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_iopipe PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_overhead COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:overhead>) @@ -126,6 +135,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_overhead PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_overhead" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_overhead PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_perf_meta COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:perf_meta>) @@ -145,6 +157,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_perf_meta PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_perf_meta" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_perf_meta PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_zip_perf_help COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> "-h") @@ -164,6 +179,9 @@ if (HDF5_TEST_SERIAL) set_tests_properties (PERFORM_zip_perf_help PROPERTIES FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_zip_perf_help" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_zip_perf_help PROPERTIES DISABLED true) + endif () if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME PERFORM_zip_perf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:zip_perf> tfilters.h5) @@ -184,6 +202,9 @@ if (HDF5_TEST_SERIAL) DEPENDS "PERFORM_zip_perf_help" FIXTURES_REQUIRED clear_perform ) + if ("PERFORM_zip_perf" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (PERFORM_zip_perf PROPERTIES DISABLED true) + endif () endif () if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL) diff --git a/utils/mirror_vfd/CMakeLists.txt b/utils/mirror_vfd/CMakeLists.txt index 51d4694..a123c02 100644 --- a/utils/mirror_vfd/CMakeLists.txt +++ b/utils/mirror_vfd/CMakeLists.txt @@ -6,10 +6,10 @@ project (HDF5_UTILS_MIRRORVFD C) #----------------------------------------------------------------------------- set (mirror_server_SOURCES - ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.c - ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_server.c - ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_writer.c - ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.h + ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.c + ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_server.c + ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_writer.c + ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.h ) add_executable (mirror_server ${mirror_server_SOURCES}) target_include_directories (mirror_server PRIVATE "${HDF5_UTILS_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") @@ -71,10 +71,8 @@ if (HDF5_EXPORTED_TARGETS) endforeach () install ( - TARGETS - ${H5_DEP_EXECUTABLES} - EXPORT - ${HDF5_EXPORTED_TARGETS} + TARGETS ${H5_DEP_EXECUTABLES} + EXPORT ${HDF5_EXPORTED_TARGETS} RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT utilsapplications ) endif () diff --git a/utils/subfiling_vfd/CMakeLists.txt b/utils/subfiling_vfd/CMakeLists.txt index 62b6255..db59710 100644 --- a/utils/subfiling_vfd/CMakeLists.txt +++ b/utils/subfiling_vfd/CMakeLists.txt @@ -5,11 +5,8 @@ configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.in ${HDF5_UTILS_SUB # Copy h5fuse to testpar directory for subfiling tests if (HDF5_ENABLE_PARALLEL AND HDF5_TEST_PARALLEL) - file ( - COPY - ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse - DESTINATION - ${HDF5_TEST_PAR_BINARY_DIR} + file (COPY ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse + DESTINATION ${HDF5_TEST_PAR_BINARY_DIR} ) endif () |