diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-10-20 19:45:08 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-10-20 19:45:08 (GMT) |
| commit | 7b96a75dd1f423013d2ea20ad57f0a1c5e129eef (patch) | |
| tree | e447ae0421457620aa7a4fe47e4a85714bf48200 /java | |
| parent | 6d353f8ccc908d494a4ea8e1a56c9fb8e973e908 (diff) | |
| parent | 9a8a1282c57f95fa826b19c5948cc27c376113d0 (diff) | |
| download | hdf5-7b96a75dd1f423013d2ea20ad57f0a1c5e129eef.zip hdf5-7b96a75dd1f423013d2ea20ad57f0a1c5e129eef.tar.gz hdf5-7b96a75dd1f423013d2ea20ad57f0a1c5e129eef.tar.bz2 | |
Merge pull request #707 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '9a8a1282c57f95fa826b19c5948cc27c376113d0':
HDFFV-10297 Merge from develop
Merge from develop
Avoid double free
Merge from develop
Fix name of reference file
HDFFV-10297 Merge from develop
Fix test step
HDFFV-10297 correct reference file for 1.10
HDFFV-10297 merge from develop
Undo commit
HDFFV-10297 - Changes to code makes old failure moot
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} |