summaryrefslogtreecommitdiffstats
path: root/tools/h5import
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-10-03 20:34:11 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-10-03 20:34:11 (GMT)
commitdd9caf37d2e1191ed9abce4c34564ab22a8d53a8 (patch)
tree9713c60a644b845e59b214fd378fd4367cab7ebb /tools/h5import
parent869ef118e914f127e9f1a2f949b760f1585dba0f (diff)
downloadhdf5-dd9caf37d2e1191ed9abce4c34564ab22a8d53a8.zip
hdf5-dd9caf37d2e1191ed9abce4c34564ab22a8d53a8.tar.gz
hdf5-dd9caf37d2e1191ed9abce4c34564ab22a8d53a8.tar.bz2
Merge test output file clearing into runTest.cmake
Diffstat (limited to 'tools/h5import')
-rw-r--r--tools/h5import/CMakeTests.cmake20
1 files changed, 1 insertions, 19 deletions
diff --git a/tools/h5import/CMakeTests.cmake b/tools/h5import/CMakeTests.cmake
index ef029e9..54e7abe 100644
--- a/tools/h5import/CMakeTests.cmake
+++ b/tools/h5import/CMakeTests.cmake
@@ -88,20 +88,8 @@
set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-h5importtest)
endif ()
else (HDF5_ENABLE_USING_MEMCHECKER)
- add_test (
- NAME H5IMPORT-${testname}-clear-objects
- COMMAND ${CMAKE_COMMAND}
- -E remove
- ${testfile}
- ${testfile}.new
- ${testfile}.new.err
- ${testfile}.out
- ${testfile}.out.err
- )
- set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
-
add_test (NAME H5IMPORT-${testname} COMMAND $<TARGET_FILE:h5import> ${importfile} -c ${conffile} -o ${testfile})
- set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-${testname}-clear-objects)
+ set_tests_properties (H5IMPORT-${testname} PROPERTIES DEPENDS H5IMPORT-h5importtest)
add_test (
NAME H5IMPORT-${testname}-H5DMP
@@ -141,12 +129,6 @@
-E remove
d${testfile}
d${testfile}.bin
- d${testfile}.imp
- d${testfile}.imp.err
- d${testfile}.dmp
- d${testfile}.dmp.err
- d${testfile}.dff
- d${testfile}.dff.err
)
set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)