summaryrefslogtreecommitdiffstats
path: root/java/examples/groups
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-09-23 17:39:01 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-09-23 17:39:01 (GMT)
commit7997eb8c84dd07dacbcc427049f838d883e263b8 (patch)
tree2e9a6387131da06b8107fabb1394a271f3f3282b /java/examples/groups
parent93e8bbd9f47d6a2eace95f2ed3b2dd4b6336940a (diff)
parentcf9eff93e05c9e68d82ebb1fc1e02319e428af35 (diff)
downloadhdf5-7997eb8c84dd07dacbcc427049f838d883e263b8.zip
hdf5-7997eb8c84dd07dacbcc427049f838d883e263b8.tar.gz
hdf5-7997eb8c84dd07dacbcc427049f838d883e263b8.tar.bz2
Merge pull request #1937 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'cf9eff93e05c9e68d82ebb1fc1e02319e428af35': Remove obsolete symbol small syntax changes
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 ()