diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/API/CMakeLists.txt | 369 | ||||
-rw-r--r-- | test/CMakeLists.txt | 50 | ||||
-rw-r--r-- | test/CMakePassthroughVOLTests.cmake | 16 | ||||
-rw-r--r-- | test/CMakeTests.cmake | 68 | ||||
-rw-r--r-- | test/CMakeVFDTests.cmake | 19 | ||||
-rw-r--r-- | test/ShellTests.cmake | 12 |
6 files changed, 304 insertions, 230 deletions
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 () |