diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/libtest/CMakeTests.cmake | 16 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeTestsPBITS.cmake | 20 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeTestsVDS.cmake | 20 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeTestsXML.cmake | 20 | ||||
-rw-r--r-- | tools/test/h5dump/CMakeVFDTests.cmake | 21 | ||||
-rw-r--r-- | tools/test/h5ls/CMakeTests.cmake | 60 |
6 files changed, 0 insertions, 157 deletions
diff --git a/tools/libtest/CMakeTests.cmake b/tools/libtest/CMakeTests.cmake index 6863822..79810c4 100644 --- a/tools/libtest/CMakeTests.cmake +++ b/tools/libtest/CMakeTests.cmake @@ -24,26 +24,10 @@ ############################################################################## macro (ADD_H5_TEST resultfile resultcode) - add_test ( - NAME H5LIBTEST-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} - -E remove - ${resultfile}.out - ${resultfile}.out.err - ) add_test (NAME H5LIBTEST-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5tools_test_utils> ${ARGN}) if (NOT "${resultcode}" STREQUAL "0") set_tests_properties (H5LIBTEST-${resultfile} PROPERTIES WILL_FAIL "true") endif () - set_tests_properties (H5LIBTEST-${resultfile} PROPERTIES DEPENDS H5LIBTEST-${resultfile}-clear-objects) - add_test ( - NAME H5LIBTEST-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} - -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5LIBTEST-${resultfile}-clean-objects PROPERTIES DEPENDS H5LIBTEST-${resultfile}) endmacro () ############################################################################## diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake index 8bf0940..72130bf 100644 --- a/tools/test/h5dump/CMakeTestsPBITS.cmake +++ b/tools/test/h5dump/CMakeTestsPBITS.cmake @@ -120,15 +120,6 @@ ############################################################################## macro (ADD_H5_PBITS_TEST resultfile resultcode) - add_test ( - NAME H5DUMP-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits" - ) # 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_file_ext}> ${ARGN}) @@ -150,17 +141,6 @@ ) endif () set_tests_properties (H5DUMP-${resultfile} PROPERTIES - DEPENDS H5DUMP-${resultfile}-clear-objects - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits" - ) - add_test ( - NAME H5DUMP-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES - DEPENDS H5DUMP-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits" ) endmacro () diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake index 017a9fe..0d982f4 100644 --- a/tools/test/h5dump/CMakeTestsVDS.cmake +++ b/tools/test/h5dump/CMakeTestsVDS.cmake @@ -117,15 +117,6 @@ macro (ADD_H5_VDS_TEST resultfile resultcode) # If using memchecker add tests without using scripts - add_test ( - NAME H5DUMP-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds" - ) if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5DUMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_ext}> ${ARGN}) if (${resultcode}) @@ -146,17 +137,6 @@ ) endif () set_tests_properties (H5DUMP-${resultfile} PROPERTIES - DEPENDS H5DUMP-${resultfile}-clear-objects - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds" - ) - add_test ( - NAME H5DUMP-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP-${resultfile}-clean-objects PROPERTIES - DEPENDS H5DUMP-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds" ) endmacro () diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake index a09256d..33f237d 100644 --- a/tools/test/h5dump/CMakeTestsXML.cmake +++ b/tools/test/h5dump/CMakeTestsXML.cmake @@ -175,15 +175,6 @@ endmacro () macro (ADD_XML_H5_TEST resultfile resultcode) - add_test ( - NAME H5DUMP_XML-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP_XML-${resultfile}-clear-objects PROPERTIES - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml" - ) if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5DUMP_XML-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5dump${tgt_file_ext}> --xml ${ARGN}) if (${resultcode}) @@ -204,17 +195,6 @@ ) endif () set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES - DEPENDS H5DUMP_XML-${resultfile}-clear-objects - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml" - ) - add_test ( - NAME H5DUMP_XML-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP_XML-${resultfile}-clean-objects PROPERTIES - DEPENDS H5DUMP_XML-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml" ) endmacro () diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake index bd189da..dd1cb39 100644 --- a/tools/test/h5dump/CMakeVFDTests.cmake +++ b/tools/test/h5dump/CMakeVFDTests.cmake @@ -42,15 +42,6 @@ add_custom_target(HDF5_VFD_H5DUMP_files ALL COMMENT "Copying files needed by HDF macro (ADD_VFD_H5DUMP_TEST vfdname resultfile resultcode) if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( - NAME H5DUMP_VFD-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP_VFD-${resultfile}-clear-objects PROPERTIES - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}" - ) - add_test ( NAME H5DUMP_VFD-${vfdname}-${resultfile}-h5dump COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" @@ -65,20 +56,8 @@ macro (ADD_VFD_H5DUMP_TEST vfdname resultfile resultcode) ) set_tests_properties (H5DUMP_VFD-${vfdname}-${resultfile}-h5dump PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT}) set_tests_properties (H5DUMP_VFD-${resultfile} PROPERTIES - DEPENDS H5DUMP_VFD-${resultfile}-clear-objects - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}" - ) - add_test ( - NAME H5DUMP_VFD-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5DUMP_VFD-${resultfile}-clean-objects PROPERTIES - DEPENDS H5DUMP_VFD-${resultfile} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}" ) - endmacro () endif () endmacro () diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 0c493dd..2e2cc0b 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -135,15 +135,6 @@ ############################################################################## macro (ADD_H5_TEST resultfile resultcode) - add_test ( - NAME H5LS-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5LS-${resultfile}-clear-objects PROPERTIES - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" - ) # 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${tgt_file_ext}> ${ARGN}) @@ -169,31 +160,11 @@ ) endif () set_tests_properties (H5LS-${resultfile} PROPERTIES - DEPENDS "H5LS-${resultfile}-clear-objects" - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" - ) - add_test ( - NAME H5LS-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5LS-${resultfile}-clean-objects PROPERTIES - DEPENDS "H5LS-${resultfile}" WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) endmacro () macro (ADD_H5_ERR_TEST resultfile resultcode) - add_test ( - NAME H5LS-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5LS-${resultfile}-clear-objects PROPERTIES - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" - ) # 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${tgt_file_ext}> ${ARGN}) @@ -217,17 +188,6 @@ ) endif () set_tests_properties (H5LS-${resultfile} PROPERTIES - DEPENDS "H5LS-${resultfile}-clear-objects" - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" - ) - add_test ( - NAME H5LS-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5LS-${resultfile}-clean-objects PROPERTIES - DEPENDS "H5LS-${resultfile}" WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) endmacro () @@ -235,15 +195,6 @@ macro (ADD_H5_UD_TEST testname resultcode resultfile) if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( - NAME H5LS_UD-${testname}-${resultfile}-clear-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5LS_UD-${testname}-${resultfile}-clear-objects PROPERTIES - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" - ) - add_test ( NAME H5LS_UD-${testname}-${resultfile} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" @@ -259,17 +210,6 @@ -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) set_tests_properties (H5LS_UD-${testname}-${resultfile} PROPERTIES - DEPENDS "H5LS_UD-${testname}-${resultfile}-clear-objects" - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" - ) - add_test ( - NAME H5LS_UD-${testname}-${resultfile}-clean-objects - COMMAND ${CMAKE_COMMAND} -E remove - ${resultfile}.out - ${resultfile}.out.err - ) - set_tests_properties (H5LS_UD-${testname}-${resultfile}-clean-objects PROPERTIES - DEPENDS "H5LS_UD-${testname}-${resultfile}" WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" ) endif () |