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 /tools/test/h5dump | |
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)
Diffstat (limited to 'tools/test/h5dump')
-rw-r--r-- | tools/test/h5dump/CMakeTests.cmake | 58 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeTestsPBITS.cmake | 3 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeTestsVDS.cmake | 9 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeTestsXML.cmake | 5 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeVFDTests.cmake | 3 |
5 files changed, 74 insertions, 4 deletions
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 () |