summaryrefslogtreecommitdiffstats
path: root/java/examples/groups
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2019-09-26 18:41:56 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2019-09-26 18:41:56 (GMT)
commit52fef3c6d2b79399caa316cf7f380e61db95ba0e (patch)
tree674e43393bf837a1ac750a0d9766e948636245d5 /java/examples/groups
parentc7b9d5acc69e22c153864e31f7422cd466da0b35 (diff)
parent0ea77179d507bd2c29f3b9b357a0c35d4077b29c (diff)
downloadhdf5-52fef3c6d2b79399caa316cf7f380e61db95ba0e.zip
hdf5-52fef3c6d2b79399caa316cf7f380e61db95ba0e.tar.gz
hdf5-52fef3c6d2b79399caa316cf7f380e61db95ba0e.tar.bz2
Merge pull request #21 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10585-investigate-slowness-of-regular
* commit '0ea77179d507bd2c29f3b9b357a0c35d4077b29c': (39 commits) Fix the errors when updating the versions in the new 1.13 develop branch. add missing version to list Add new versioned filename to list Update N_FSINFO_VERSION_BOUNDS to H5F_LIBVER_NBOUND. Remove file script Update versioning to next major version Update develop branch version to 1.13.0 after creation of hdf5_1_12 branch. Merge Binh-Minh's changes for code improvement to chunk_info.c (PR #1942) to develop branch. Update to current external file population. Revert else-if to single line. Fix missing option and incorrect close Revert "Moved NDEBUG guards to H5EA_DEBUG in H5EA package." Revert "Fix for H5EA debug package when built in release mode." Change print calls to HD-wrapped. Minor formatting tweaks (inc. regressions and in-file style-matching). Refactor h5repackgentest to have more modular internals, for easier addition of new tests. Update manifest and test script for new hdf5 external-storage .h5 files. Remove obsolete symbol small syntax changes Renamed get/set_time() calls in the tools library to avoid name clash when building static parallel HDF5 w/ static linking to OpenMPI. Change unused variable to generic form Whitespace cleanup ...
Diffstat (limited to 'java/examples/groups')
-rw-r--r--java/examples/groups/CMakeLists.txt15
1 files changed, 11 insertions, 4 deletions
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index e1ad108..9e43087 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -63,17 +63,22 @@ if (BUILD_TESTING)
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}-clear-h5s
+ NAME JAVA_groups-${example}-clear-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}-clear-h5s
+ NAME JAVA_groups-${example}-clear-objects
COMMAND ${CMAKE_COMMAND} -E remove ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
)
endif ()
+ else ()
+ add_test (
+ NAME JAVA_groups-${example}-clear-objects
+ COMMAND ${CMAKE_COMMAND} -E echo "${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 exists"
+ )
endif ()
add_test (
@@ -82,7 +87,7 @@ if (BUILD_TESTING)
${HDFJAVA_EXAMPLES_SOURCE_DIR}/testfiles/examples.groups.${example}.txt
${HDFJAVA_EXAMPLES_GROUPS_BINARY_DIR}/${example}.txt
)
- set_tests_properties (JAVA_groups-${example}-copy-objects PROPERTIES DEPENDS JAVA_groups-${example}-clear-h5s)
+ set_tests_properties (JAVA_groups-${example}-copy-objects PROPERTIES DEPENDS JAVA_groups-${example}-clear-objects)
add_test (
NAME JAVA_groups-${example}
COMMAND "${CMAKE_COMMAND}"
@@ -97,6 +102,8 @@ if (BUILD_TESTING)
-D "TEST_REFERENCE=groups/${example}.txt"
-P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
)
- set_tests_properties (JAVA_groups-${example} PROPERTIES DEPENDS JAVA_groups-${example}-copy-objects)
+ set_tests_properties (JAVA_groups-${example} PROPERTIES
+ DEPENDS JAVA_groups-${example}-copy-objects
+ )
endforeach ()
endif ()