summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
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/h5ls
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/h5ls')
-rw-r--r--tools/h5ls/CMakeTests.cmake6
-rw-r--r--tools/h5ls/CMakeTestsVDS.cmake6
2 files changed, 0 insertions, 12 deletions
diff --git a/tools/h5ls/CMakeTests.cmake b/tools/h5ls/CMakeTests.cmake
index 4e6a08f..816907c 100644
--- a/tools/h5ls/CMakeTests.cmake
+++ b/tools/h5ls/CMakeTests.cmake
@@ -119,11 +119,6 @@
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else (HDF5_ENABLE_USING_MEMCHECKER)
-# add_test (
-# NAME H5LS-${resultfile}-clear-objects
-# COMMAND ${CMAKE_COMMAND}
-# -E remove ./testfiles/${resultfile}.out ./testfiles/${resultfile}.out.err
-# )
add_test (
NAME H5LS-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@@ -135,7 +130,6 @@
-D "TEST_REFERENCE=${resultfile}.ls"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
- set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS "H5LS-${resultfile}-clear-objects")
endif (HDF5_ENABLE_USING_MEMCHECKER)
ENDMACRO (ADD_H5_TEST file)
diff --git a/tools/h5ls/CMakeTestsVDS.cmake b/tools/h5ls/CMakeTestsVDS.cmake
index 240eed0..0c825cb 100644
--- a/tools/h5ls/CMakeTestsVDS.cmake
+++ b/tools/h5ls/CMakeTestsVDS.cmake
@@ -70,11 +70,6 @@
set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else (HDF5_ENABLE_USING_MEMCHECKER)
-# add_test (
-# NAME H5LS-${resultfile}-clear-objects
-# COMMAND ${CMAKE_COMMAND}
-# -E remove ./testfiles/vds/${resultfile}.out ./testfiles/vds/${resultfile}.out.err
-# )
add_test (
NAME H5LS-${resultfile}
COMMAND "${CMAKE_COMMAND}"
@@ -86,7 +81,6 @@
-D "TEST_REFERENCE=${resultfile}.ls"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
- set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS "H5LS_VDS-${resultfile}-clear-objects")
endif (HDF5_ENABLE_USING_MEMCHECKER)
ENDMACRO (ADD_H5_VDS_TEST file)