diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-19 13:56:14 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-19 13:56:14 (GMT) |
| commit | 4ef9c810483c21c99768959db58cb7b6d63ad1e1 (patch) | |
| tree | 2666628a2ff31b9cd0eda17b85583b50c7eb44bf /tools/test/h5ls | |
| parent | f6ec9a1343dcd75fbc56de8fdaf9ed7c05241fea (diff) | |
| download | hdf5-4ef9c810483c21c99768959db58cb7b6d63ad1e1.zip hdf5-4ef9c810483c21c99768959db58cb7b6d63ad1e1.tar.gz hdf5-4ef9c810483c21c99768959db58cb7b6d63ad1e1.tar.bz2 | |
Added new CMake options for tests
Diffstat (limited to 'tools/test/h5ls')
| -rw-r--r-- | tools/test/h5ls/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tools/test/h5ls/CMakeTests.cmake | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/test/h5ls/CMakeLists.txt b/tools/test/h5ls/CMakeLists.txt index 0da03c5..abbe6d0 100644 --- a/tools/test/h5ls/CMakeLists.txt +++ b/tools/test/h5ls/CMakeLists.txt @@ -30,6 +30,8 @@ if (BUILD_SHARED_LIBS) ) endif () -include (CMakeTests.cmake) +if (HDF5_TEST_TOOLS AND HDF5_TEST_SERIAL) + include (CMakeTests.cmake) -include (CMakeTestsVDS.cmake) + include (CMakeTestsVDS.cmake) +endif () diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 2f3f3ab..7ff17ff 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -168,7 +168,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") |