Skip to content

Commit 02201e3

Browse files
byrnHDFjhendersonHDF
byrnHDF
authored and
jhendersonHDF
committed
Add HDF5_DISABLE_TESTS_REGEX option to skip tests (HDFGroup#3859)
1 parent c09742f commit 02201e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+800
-163
lines changed

‎CMakeTests.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
math (EXPR CTEST_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 2")
2424
math (EXPR CTEST_VERY_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 3")
2525

26+
option (HDF5_DISABLE_TESTS_REGEX "Regex pattern to set execution of specific tests to DISABLED" "")
27+
mark_as_advanced (HDF5_DISABLE_TESTS_REGEX)
28+
2629
option (HDF5_TEST_API "Execute HDF5 API tests" OFF)
2730
mark_as_advanced (HDF5_TEST_API)
2831
if (HDF5_TEST_API)

‎c++/test/CMakeTests.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ endif ()
3535
set_tests_properties (CPP_testhdf5 PROPERTIES
3636
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
3737
)
38+
if ("CPP_testhdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
39+
set_tests_properties (CPP_testhdf5 PROPERTIES DISABLED true)
40+
endif ()
3841

3942
##############################################################################
4043
##############################################################################

‎c++/test/CMakeVFDTests.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ macro (ADD_VFD_TEST vfdname resultcode)
3737
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
3838
)
3939
set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT})
40+
if ("CPP_VFD-${vfdname}-cpp_testhdf5" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
41+
set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DISABLED true)
42+
endif ()
4043
endif ()
4144
endmacro ()
4245

‎config/cmake/scripts/CTestScript.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@ list (APPEND CTEST_NOTES_FILES
184184
"${CMAKE_CURRENT_LIST_FILE}"
185185
"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"
186186
)
187+
if (EXISTS "${CTEST_SCRIPT_DIRECTORY}/SkipTests.log")
188+
list(APPEND CTEST_NOTES_FILES
189+
"${CTEST_SCRIPT_DIRECTORY}/SkipTests.log"
190+
)
191+
endif ()
187192

188193
#-----------------------------------------------------------------------------
189194
# Check for required variables.

‎fortran/test/CMakeTests.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ endif ()
9494
set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES
9595
FIXTURES_REQUIRED clear_testhdf5_fortran
9696
)
97+
if ("FORTRAN_testhdf5_fortran" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
98+
set_tests_properties (FORTRAN_testhdf5_fortran PROPERTIES DISABLED true)
99+
endif ()
97100

98101
#-- Adding test for testhdf5_fortran_1_8
99102
if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -118,6 +121,9 @@ set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES
118121
DEPENDS FORTRAN_testhdf5_fortran
119122
FIXTURES_REQUIRED clear_testhdf5_fortran
120123
)
124+
if ("FORTRAN_testhdf5_fortran_1_8" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
125+
set_tests_properties (FORTRAN_testhdf5_fortran_1_8 PROPERTIES DISABLED true)
126+
endif ()
121127

122128
#-- Adding test for fortranlib_test_F03
123129
if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -142,6 +148,9 @@ set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES
142148
DEPENDS FORTRAN_testhdf5_fortran_1_8
143149
FIXTURES_REQUIRED clear_testhdf5_fortran
144150
)
151+
if ("FORTRAN_fortranlib_test_F03" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
152+
set_tests_properties (FORTRAN_fortranlib_test_F03 PROPERTIES DISABLED true)
153+
endif ()
145154

146155
#-- Adding test for vol_connector
147156
if (HDF5_ENABLE_USING_MEMCHECKER)
@@ -164,6 +173,9 @@ endif ()
164173
set_tests_properties (FORTRAN_vol_connector PROPERTIES
165174
FIXTURES_REQUIRED clear_testhdf5_fortran
166175
)
176+
if ("FORTRAN_vol_connector" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
177+
set_tests_properties (FORTRAN_vol_connector PROPERTIES DISABLED true)
178+
endif ()
167179

168180
#-- Adding test for fflush1
169181
add_test (
@@ -177,6 +189,9 @@ add_test (
177189
set_tests_properties (FORTRAN_fflush1 PROPERTIES
178190
DEPENDS FORTRAN_flush1-clear-objects
179191
)
192+
if ("FORTRAN_fflush1" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
193+
set_tests_properties (FORTRAN_fflush1 PROPERTIES DISABLED true)
194+
endif ()
180195

181196
#-- Adding test for fflush2
182197
add_test (
@@ -186,6 +201,9 @@ add_test (
186201
set_tests_properties (FORTRAN_fflush2 PROPERTIES
187202
DEPENDS FORTRAN_fflush1
188203
)
204+
if ("FORTRAN_fflush2" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
205+
set_tests_properties (FORTRAN_fflush2 PROPERTIES DISABLED true)
206+
endif ()
189207
add_test (
190208
NAME FORTRAN_flush1-clean-objects
191209
COMMAND ${CMAKE_COMMAND} -E remove flush.h5

‎fortran/testpar/CMakeTests.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,16 @@
1616
##############################################################################
1717
##############################################################################
1818
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})
19+
if ("MPI_TEST_FORT_parallel_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
20+
set_tests_properties (MPI_TEST_FORT_parallel_test PROPERTIES DISABLED true)
21+
endif ()
22+
1923
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})
24+
if ("MPI_TEST_FORT_subfiling_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
25+
set_tests_properties (MPI_TEST_FORT_subfiling_test PROPERTIES DISABLED true)
26+
endif ()
27+
2028
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})
29+
if ("MPI_TEST_FORT_async_test" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
30+
set_tests_properties (MPI_TEST_FORT_async_test PROPERTIES DISABLED true)
31+
endif ()

‎hl/c++/test/CMakeTests.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ else ()
4444
)
4545
endif ()
4646
set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects)
47+
if ("HL_CPP_ptableTest" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
48+
set_tests_properties (HL_CPP_ptableTest PROPERTIES DISABLED true)
49+
endif ()
4750
add_test (
4851
NAME HL_CPP_ptableTest-clean-objects
4952
COMMAND ${CMAKE_COMMAND}
@@ -53,3 +56,4 @@ set_tests_properties (HL_CPP_ptableTest-clean-objects PROPERTIES
5356
DEPENDS HL_CPP_ptableTest
5457
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
5558
)
59+

‎hl/fortran/test/CMakeTests.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ macro (ADD_H5_FORTRAN_TEST file)
6868
FIXTURES_REQUIRED clear_HL_FORTRAN_test
6969
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
7070
)
71+
if ("HL_FORTRAN_f90_${file}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
72+
set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES DISABLED true)
73+
endif ()
7174
endmacro ()
7275

7376
foreach (h5_test ${H5_TESTS})

‎hl/test/CMakeTests.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ macro (HL_ADD_TEST hl_name)
118118
ENVIRONMENT "srcdir=${HDF5_HL_TEST_BINARY_DIR}"
119119
WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR}
120120
)
121+
if ("HL_${hl_name}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
122+
set_tests_properties (HL_${hl_name} PROPERTIES DISABLED true)
123+
endif ()
121124
endmacro ()
122125

123126
HL_add_test (test_lite )

‎hl/tools/h5watch/CMakeTests.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
8686
DEPENDS ${last_test}
8787
FIXTURES_REQUIRED gen_test_watch
8888
)
89+
if ("H5WATCH_ARGS-h5watch-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
90+
set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DISABLED true)
91+
endif ()
8992
set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
9093
endif ()
9194
endmacro ()
@@ -109,6 +112,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
109112
DEPENDS ${last_test}
110113
FIXTURES_REQUIRED gen_test_watch
111114
)
115+
if ("H5WATCH_ARGS-h5watch-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
116+
set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DISABLED true)
117+
endif ()
112118
set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
113119
endif ()
114120
endmacro ()
@@ -131,6 +137,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
131137
DEPENDS ${last_test}
132138
FIXTURES_REQUIRED gen_test_watch
133139
)
140+
if ("H5WATCH-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
141+
set_tests_properties (H5WATCH-${resultfile} PROPERTIES DISABLED true)
142+
endif ()
134143
set (last_test "H5WATCH-${resultfile}")
135144
endif ()
136145
endmacro ()

0 commit comments

Comments
 (0)