diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-06-15 14:50:02 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-15 14:50:02 (GMT) |
commit | 4a6872cbf62380ec0ee3394d5e0710de2216b21d (patch) | |
tree | 4f267f9d4f3087deeb23a14084128b23741006a2 /java/examples/groups | |
parent | dee5daa7a1a6e52e4fe54e18ea31b44ce5b42f88 (diff) | |
download | hdf5-4a6872cbf62380ec0ee3394d5e0710de2216b21d.zip hdf5-4a6872cbf62380ec0ee3394d5e0710de2216b21d.tar.gz hdf5-4a6872cbf62380ec0ee3394d5e0710de2216b21d.tar.bz2 |
Merges from develop/1.14 (#3118)
* Fix release action that allows files to be uploaded.
Add autotools h5copy help test.
Update cmake tools.cmake file for clang-tidy.
CMake build is missing H5FDsubfiling.h
macros improved for configure output capture.
Remove obsolete files
* Revert parallel config with TS
* Fix doxygen warnings
Diffstat (limited to 'java/examples/groups')
-rw-r--r-- | java/examples/groups/CMakeLists.txt | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt index 9f20abf..fdaf95c 100644 --- a/java/examples/groups/CMakeLists.txt +++ b/java/examples/groups/CMakeLists.txt @@ -66,6 +66,7 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME) set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;") + set (last_test "") foreach (example ${HDF_JAVA_EXAMPLES}) if (NOT example STREQUAL "H5Ex_G_Iterate" AND NOT example STREQUAL "H5Ex_G_Visit") if (example STREQUAL "H5Ex_G_Compact") @@ -78,7 +79,8 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) else () add_test ( NAME JAVA_groups-${example}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 + COMMAND ${CMAKE_COMMAND} -E remove + ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 ) endif () else () @@ -87,6 +89,9 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) COMMAND ${CMAKE_COMMAND} -E echo "${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 exists" ) endif () + if (last_test) + set_tests_properties (JAVA_groups-${example}-clear-objects PROPERTIES DEPENDS ${last_test}) + endif () add_test ( NAME JAVA_groups-${example}-copy-objects @@ -112,5 +117,28 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL) set_tests_properties (JAVA_groups-${example} PROPERTIES DEPENDS JAVA_groups-${example}-copy-objects ) + + if (NOT example STREQUAL "H5Ex_G_Iterate" AND NOT example STREQUAL "H5Ex_G_Visit") + if (example STREQUAL "H5Ex_G_Compact") + add_test ( + NAME JAVA_groups-${example}-clean-objects + COMMAND ${CMAKE_COMMAND} -E remove + ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}1.h5 + ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}2.h5 + ) + else () + add_test ( + NAME JAVA_groups-${example}-clean-objects + COMMAND ${CMAKE_COMMAND} -E remove + ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 + ) + endif () + set_tests_properties (JAVA_groups-${example}-clean-objects PROPERTIES + DEPENDS JAVA_groups-${example} + ) + set (last_test "JAVA_groups-${example}-clean-objects") + else () + set (last_test "JAVA_groups-${example}") + endif () endforeach () endif () |