diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-20 19:52:41 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-20 19:52:41 (GMT) |
| commit | 80161447bb08638ef4264208600ba1e0b0fcb57a (patch) | |
| tree | e0f8f65a67d5cfa2310c4a664948f3b4e0d32a24 /tools/h5ls | |
| parent | 77ac7cb908055dd6f5a015207a126c73536685d5 (diff) | |
| download | hdf5-80161447bb08638ef4264208600ba1e0b0fcb57a.zip hdf5-80161447bb08638ef4264208600ba1e0b0fcb57a.tar.gz hdf5-80161447bb08638ef4264208600ba1e0b0fcb57a.tar.bz2 | |
Merfge changes to CMake test options and add sanitizers
Diffstat (limited to 'tools/h5ls')
| -rw-r--r-- | tools/h5ls/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/h5ls/CMakeTests.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt index 120d899..4857cd4 100644 --- a/tools/h5ls/CMakeLists.txt +++ b/tools/h5ls/CMakeLists.txt @@ -56,7 +56,9 @@ if (BUILD_TESTING) ) endif () - include (CMakeTests.cmake) + if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL) + include (CMakeTests.cmake) + endif () endif () diff --git a/tools/h5ls/CMakeTests.cmake b/tools/h5ls/CMakeTests.cmake index f8bae9b..73dc3b9 100644 --- a/tools/h5ls/CMakeTests.cmake +++ b/tools/h5ls/CMakeTests.cmake @@ -166,7 +166,7 @@ macro (ADD_H5_ERR_TEST resultfile resultcode) # If using memchecker add tests without using scripts if (HDF5_ENABLE_USING_MEMCHECKER) - add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls> ${ARGN}) + add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN}) set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") if (${resultcode} EQUAL 1) set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true") |