diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-10-03 19:13:47 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-10-03 19:13:47 (GMT) |
| commit | e6a2a9f43fe85ba2f3a6b03c4d16afd194c49da7 (patch) | |
| tree | 317a582e2b1f370e00a295b2d404740afeefee53 /java | |
| parent | 8caeed7e5449351ae902eae1088d75e72c59f542 (diff) | |
| parent | 68a9844991cfaaca2d0f97d7828f1f6f59af1349 (diff) | |
| download | hdf5-e6a2a9f43fe85ba2f3a6b03c4d16afd194c49da7.zip hdf5-e6a2a9f43fe85ba2f3a6b03c4d16afd194c49da7.tar.gz hdf5-e6a2a9f43fe85ba2f3a6b03c4d16afd194c49da7.tar.bz2 | |
Merge pull request #688 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
buildbot tests passing
* commit '68a9844991cfaaca2d0f97d7828f1f6f59af1349':
VS2012 and earlier cannot have execute stmnts before declare
Correct depends name
Fix list of names
new reference file
Fix repack plugin test - reorganize test macros
Adjust filter available variables
Fix STREQUAL if commands.
Update error handling to support ARGS and tools stack
Diffstat (limited to 'java')
| -rw-r--r-- | java/examples/datasets/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java/examples/groups/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt index d698cfd..3972ec8 100644 --- a/java/examples/datasets/CMakeLists.txt +++ b/java/examples/datasets/CMakeLists.txt @@ -101,7 +101,7 @@ if (BUILD_TESTING) endif (H5_HAVE_FILTER_SZIP) foreach (example ${HDF_JAVA_EXAMPLES}) - if (${example} STREQUAL "H5Ex_D_External") + if ("${example}" STREQUAL "H5Ex_D_External") add_test ( NAME JAVA_datasets-${example}-clear-objects COMMAND ${CMAKE_COMMAND} @@ -129,7 +129,7 @@ if (BUILD_TESTING) ) set_tests_properties (JAVA_datasets-${example}-copy-objects PROPERTIES DEPENDS JAVA_datasets-${example}-clear-objects) set (last_test "JAVA_datasets-${example}-copy-objects") - if (${example} STREQUAL "H5Ex_D_Szip") + if ("${example}" STREQUAL "H5Ex_D_Szip") if (USE_FILTER_SZIP) ADD_H5_TEST (${example} 0) endif () diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt index bb5f80f..b912208 100644 --- a/java/examples/groups/CMakeLists.txt +++ b/java/examples/groups/CMakeLists.txt @@ -90,8 +90,8 @@ ENDMACRO () if (BUILD_TESTING) 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") + 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 COMMAND ${CMAKE_COMMAND} |