summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2018-11-12 22:23:54 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2018-11-12 22:23:54 (GMT)
commite2ed2edf6ef1111b1f9962bd44f8f76612adf8d0 (patch)
tree639ae80b9c412115bbb178fc97276104304c093e /tools/test
parent17f9cb41583a1f7195337791852214d02c24a005 (diff)
parentf515574dcfdb9be2c5b788e472833da47a8105a7 (diff)
downloadhdf5-e2ed2edf6ef1111b1f9962bd44f8f76612adf8d0.zip
hdf5-e2ed2edf6ef1111b1f9962bd44f8f76612adf8d0.tar.gz
hdf5-e2ed2edf6ef1111b1f9962bd44f8f76612adf8d0.tar.bz2
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol
Diffstat (limited to 'tools/test')
-rw-r--r--tools/test/h5dump/CMakeTests.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index b02dc35..382e664 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -750,10 +750,10 @@
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
set_tests_properties (H5DUMP-IMPORT-${resultfile} PROPERTIES DEPENDS "H5DUMP-IMPORT-${resultfile}-clear-objects")
- add_test (NAME H5DUMP-IMPORT-h5import-${resultfile} COMMAND h5import ${resultfile}.bin -c ${conffile}.out -o ${resultfile}.h5)
+ add_test (NAME H5DUMP-IMPORT-h5import-${resultfile} COMMAND $<TARGET_FILE:h5import> ${resultfile}.bin -c ${conffile}.out -o ${resultfile}.h5)
set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
set_tests_properties (H5DUMP-IMPORT-h5import-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-${resultfile})
- add_test (NAME H5DUMP-IMPORT-h5diff-${resultfile} COMMAND h5diff ${testfile} ${resultfile}.h5 /integer /integer)
+ add_test (NAME H5DUMP-IMPORT-h5diff-${resultfile} COMMAND $<TARGET_FILE:h5diff> ${testfile} ${resultfile}.h5 /integer /integer)
set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
set_tests_properties (H5DUMP-IMPORT-h5diff-${resultfile} PROPERTIES DEPENDS H5DUMP-IMPORT-h5import-${resultfile})
endif ()