Skip to content

Commit c2e42b3

Browse files
authored
Change how library tests run (HDFGroup#693)
The Autotools ran the mfhdf tests via a script, which is unnecessary. They now run directly. CMake ran hdf and mfhdf tests using PASS_REGULAR_EXPRESSION, which has proved to be flaky, when CTest can't find the regular expression. These tests are now run directly and the exit code inspected.
1 parent 899f063 commit c2e42b3

File tree

5 files changed

+0
-115
lines changed

5 files changed

+0
-115
lines changed

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,6 @@ AC_CONFIG_FILES([Makefile
12091209
mfhdf/nctest/Makefile
12101210
mfhdf/test/Makefile
12111211
mfhdf/test/srcdir_str.h
1212-
mfhdf/test/testmfhdf.sh
12131212
java/Makefile
12141213
java/src/Makefile
12151214
java/src/jni/Makefile

hdf/test/CMakeTests.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,7 @@ foreach (decade ${thf_decade})
175175
endforeach (decade ${thf_decade})
176176

177177
add_test (NAME HDF_TEST-testhdf COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:testhdf>)
178-
set (passRegex "All tests were successful")
179178
set_tests_properties (HDF_TEST-testhdf PROPERTIES
180-
PASS_REGULAR_EXPRESSION "${passRegex}"
181179
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/TEST
182180
LABELS ${PROJECT_NAME}
183181
)

mfhdf/test/CMakeTests.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ add_test (
9595
set_tests_properties (MFHDF_TEST-clearall-objects PROPERTIES FIXTURES_SETUP clear_MFHDF_TEST)
9696

9797
add_test (NAME MFHDF_TEST-hdftest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hdftest>)
98-
set (passRegex "HDF-SD test passes")
9998
set_tests_properties (MFHDF_TEST-hdftest PROPERTIES
100-
PASS_REGULAR_EXPRESSION "${passRegex}"
10199
FIXTURES_REQUIRED clear_MFHDF_TEST
102100
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/TEST
103101
LABELS ${PROJECT_NAME}
@@ -123,9 +121,7 @@ set_tests_properties (MFHDF_TEST-cdftest PROPERTIES
123121
)
124122

125123
add_test (NAME MFHDF_TEST-hdfnctest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hdfnctest>)
126-
set (NCpassRegex "HDF-nc test passes")
127124
set_tests_properties (MFHDF_TEST-hdfnctest PROPERTIES
128-
PASS_REGULAR_EXPRESSION "${NCpassRegex}"
129125
FIXTURES_REQUIRED clear_MFHDF_TEST
130126
DEPENDS MFHDF_TEST-cdftest
131127
LABELS ${PROJECT_NAME}

mfhdf/test/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ AM_CPPFLAGS=$(test_INCLUDES) $(DEFINES)
1616
#############################################################################
1717

1818
TEST_PROG = cdftest hdfnctest hdftest
19-
TEST_SCRIPT = testmfhdf.sh
2019
check_PROGRAMS = cdftest hdfnctest hdftest
21-
check_SCRIPTS = testmfhdf.sh
2220

2321
cdftest_SOURCES = cdftest.c
2422
cdftest_LDADD = $(LIBMFHDF) $(LIBHDF) @LIBS@

mfhdf/test/testmfhdf.sh.in

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)