diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-30 20:33:47 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-30 20:33:47 (GMT) |
| commit | a29f9e8451ffa391c8395db1142bd003f40f3aaa (patch) | |
| tree | cbd191c05f7339d1fa502ed8efe880abd772fd1e /tools/test/h5dump/CMakeTestsPBITS.cmake | |
| parent | 1531c49730e33e897cdfbdd0bf88267dd7f7c0f4 (diff) | |
| download | hdf5-a29f9e8451ffa391c8395db1142bd003f40f3aaa.zip hdf5-a29f9e8451ffa391c8395db1142bd003f40f3aaa.tar.gz hdf5-a29f9e8451ffa391c8395db1142bd003f40f3aaa.tar.bz2 | |
Merge changes from develop to fix various issues
Diffstat (limited to 'tools/test/h5dump/CMakeTestsPBITS.cmake')
| -rw-r--r-- | tools/test/h5dump/CMakeTestsPBITS.cmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake index a6be9ae..1e16875 100644 --- a/tools/test/h5dump/CMakeTestsPBITS.cmake +++ b/tools/test/h5dump/CMakeTestsPBITS.cmake @@ -119,16 +119,10 @@ ############################################################################## ############################################################################## - if (NOT BUILD_SHARED_LIBS) - set (tgt_ext "") - else () - set (tgt_ext "-shared") - endif () - macro (ADD_H5_PBITS_TEST resultfile resultcode) # If using memchecker add tests without using scripts if (HDF5_ENABLE_USING_MEMCHECKER) - add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_ext}> ${ARGN}) + add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_ext}> ${ARGN}) set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits") if (${resultcode}) set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true") @@ -141,7 +135,7 @@ NAME H5DUMP-${resultfile} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_ext}>" + -D "TEST_PROGRAM=$<TARGET_FILE:h5dump${tgt_file_ext}>" -D "TEST_ARGS:STRING=${ARGN}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/pbits" -D "TEST_OUTPUT=${resultfile}.out" |