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/h5dump/CMakeTests.cmake | |
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/h5dump/CMakeTests.cmake')
-rw-r--r-- | tools/test/h5dump/CMakeTests.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index d3d1c4d..4bc33f8 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -422,7 +422,7 @@ endmacro () macro (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype) - if (${testtype} STREQUAL "SKIP") + if ("${testtype}" STREQUAL "SKIP") if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( NAME H5DUMP-${skipresultfile}-SKIPPED @@ -439,7 +439,7 @@ if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN}) set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std") - if (NOT ${resultcode} STREQUAL "0") + if (NOT "${resultcode}" STREQUAL "0") set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true") endif () if (NOT "${last_test}" STREQUAL "") @@ -472,7 +472,7 @@ if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5DUMP-N-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN}) set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std") - if (NOT ${resultcode} STREQUAL "0") + if (NOT "${resultcode}" STREQUAL "0") set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WILL_FAIL "true") endif () if (NOT "${last_test}" STREQUAL "") @@ -505,7 +505,7 @@ if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN} ${resultfile}.txt ${targetfile}) set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std") - if (NOT ${resultcode} STREQUAL "0") + if (NOT "${resultcode}" STREQUAL "0") set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true") endif () if (NOT "${last_test}" STREQUAL "") @@ -545,7 +545,7 @@ if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> --ddl=${ddlfile}.txt ${ARGN} ${resultfile}.txt ${targetfile}) set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std") - if (NOT ${resultcode} STREQUAL "0") + if (NOT "${resultcode}" STREQUAL "0") set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true") endif () if (NOT "${last_test}" STREQUAL "") |