mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-13 16:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge Test Express changes. (#4329)

Browse Source
This commit is contained in:
Allen Byrne 2024-04-04 15:39:43 -05:00 committed by GitHub
parent 995e7807dd
commit 11f768ea02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/CMakeLists.txt
View File

@ -350,21 +350,26 @@ set (ttsafe_SOURCES
${HDF5_TEST_SOURCE_DIR}/ttsafe_attr_vlen.c
)
set (H5_TESTS
testhdf5 # multiple source
set (H5_EXPRESS_TESTS
cache
cache_api
cache_image # multiple source
btree2
farray
earray
fheap
objcopy_ref
objcopy
)
set (H5_TESTS
testhdf5 # multiple source
cache_tagging
lheap
ohdr
stab
gheap
evict_on_close
farray
earray
btree2
fheap
accum
hyperslab
istore
@ -383,8 +388,6 @@ set (H5_TESTS
external
external_env
efc
objcopy_ref
objcopy
links
unlink
twriteorder
@ -463,7 +466,7 @@ set (H5_TESTS_MULTIPLE
mirror_vfd
)
# Only build single source tests here
foreach (h5_test ${H5_TESTS})
foreach (h5_test ${H5_TESTS} ${H5_EXPRESS_TESTS})
if (NOT h5_test IN_LIST H5_TESTS_MULTIPLE)
ADD_H5_EXE(${h5_test})
endif ()

39
test/CMakeTests.cmake
View File

@ -344,6 +344,39 @@ set (H5TEST_SEPARATE_TESTS
flush2
vds_env
)
foreach (h5_test ${H5_EXPRESS_TESTS})
if (NOT h5_test IN_LIST H5TEST_SEPARATE_TESTS)
if (HDF5_USING_ANALYSIS_TOOL)
add_test (NAME H5TESTXPR-${h5_test} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${h5_test}>)
set_tests_properties (H5TESTXPR-${h5_test} PROPERTIES
FIXTURES_REQUIRED clear_H5TEST
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
else ()
add_test (NAME H5TESTXPR-${h5_test} COMMAND "${CMAKE_COMMAND}"
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
-D "TEST_PROGRAM=$<TARGET_FILE:${h5_test}>"
-D "TEST_ARGS:STRING="
-D "TEST_EXPECT=0"
-D "TEST_SKIP_COMPARE=TRUE"
-D "TEST_OUTPUT=${h5_test}.txt"
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
#-D "TEST_REFERENCE=${test}.out"
-D "TEST_FOLDER=${HDF5_TEST_BINARY_DIR}/H5TEST"
-P "${HDF_RESOURCES_DIR}/runTest.cmake"
)
set_tests_properties (H5TESTXPR-${h5_test} PROPERTIES
FIXTURES_REQUIRED clear_H5TEST
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
endif ()
if ("H5TESTXPR-${h5_test}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
set_tests_properties (H5TESTXPR-${h5_test} PROPERTIES DISABLED true)
endif ()
endif ()
endforeach ()
foreach (h5_test ${H5_TESTS})
if (NOT h5_test IN_LIST H5TEST_SEPARATE_TESTS)
if (HDF5_USING_ANALYSIS_TOOL)
@ -384,10 +417,10 @@ foreach (h5_test ${H5_TESTS})
endif ()
endforeach ()
set_tests_properties (H5TEST-fheap PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
set_tests_properties (H5TESTXPR-fheap PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
set_tests_properties (H5TEST-big PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
set_tests_properties (H5TEST-btree2 PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
set_tests_properties (H5TEST-objcopy PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
set_tests_properties (H5TESTXPR-btree2 PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
set_tests_properties (H5TESTXPR-objcopy PROPERTIES TIMEOUT ${CTEST_VERY_LONG_TIMEOUT})
#-- Adding test for cache
if (NOT CYGWIN)