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 /tools/test/h5ls | |
| 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 'tools/test/h5ls')
| -rw-r--r-- | tools/test/h5ls/CMakeTests.cmake | 2 | ||||
| -rw-r--r-- | tools/test/h5ls/CMakeTestsVDS.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index a04a4b6..97b453b 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -129,7 +129,7 @@ if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5LS-${resultfile} COMMAND $<TARGET_FILE:h5ls> ${ARGN}) set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") - if (${resultcode} STREQUAL "1") + if ("${resultcode}" STREQUAL "1") set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true") endif () if (NOT "${last_test}" STREQUAL "") diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake index 4a665a5..c573323 100644 --- a/tools/test/h5ls/CMakeTestsVDS.cmake +++ b/tools/test/h5ls/CMakeTestsVDS.cmake @@ -74,7 +74,7 @@ if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5LS-${resultfile} COMMAND $<TARGET_FILE:h5ls> ${ARGN}) set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds") - if (${resultcode} STREQUAL "1") + if ("${resultcode}" STREQUAL "1") set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true") endif () if (NOT "${last_test}" STREQUAL "") |