diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2017-10-17 16:48:26 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2017-10-17 16:50:46 (GMT) |
| commit | a7ba8af0d145fee16a758ae4150316c7f2a38263 (patch) | |
| tree | 1e904f5bb6ae6413e481f3d4899329e2de91eb58 /tools/test/h5ls/CMakeTests.cmake | |
| parent | fe70476a225d2e0576149e0f1bdf95689f922c77 (diff) | |
| parent | 0c207cd2f84021526690bcbc4e0a8a49ea4cb8a4 (diff) | |
| download | hdf5-a7ba8af0d145fee16a758ae4150316c7f2a38263.zip hdf5-a7ba8af0d145fee16a758ae4150316c7f2a38263.tar.gz hdf5-a7ba8af0d145fee16a758ae4150316c7f2a38263.tar.bz2 | |
Merge branch 'develop' into bugfix/version_bounds
Diffstat (limited to 'tools/test/h5ls/CMakeTests.cmake')
| -rw-r--r-- | tools/test/h5ls/CMakeTests.cmake | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index a04a4b6..d03a344 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -129,13 +129,21 @@ 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 "") set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test}) endif () else () + # Remove any output file left over from previous test run + add_test ( + NAME H5LS-${resultfile}-clear-objects + COMMAND ${CMAKE_COMMAND} + -E remove + testfiles/${resultfile}.out + testfiles/${resultfile}.out.err + ) add_test ( NAME H5LS-${resultfile} COMMAND "${CMAKE_COMMAND}" @@ -147,6 +155,7 @@ -D "TEST_REFERENCE=${resultfile}.ls" -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) + set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects) endif () endmacro () @@ -154,7 +163,7 @@ if (NOT HDF5_ENABLE_USING_MEMCHECKER) # Remove any output file left over from previous test run add_test ( - NAME H5LS_UD-${testname}-clearall-objects + NAME H5LS_UD-${testname}-clear-objects COMMAND ${CMAKE_COMMAND} -E remove testfiles/${resultfile}.out @@ -173,7 +182,7 @@ -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins" -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) - set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clearall-objects) + set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clear-objects) endif () endmacro () |