Move clear-objects inside runTest

This commit is contained in:
Allen Byrne 2016-10-03 14:50:41 -05:00
parent 620bfd58ae
commit 869ef118e9
3 changed files with 18 additions and 10 deletions

View File

@ -25,6 +25,14 @@ if (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
endif (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
endif (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
endif (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
# if there is not an error reference file add the error output to the stdout file
if (NOT TEST_ERRREF)
set (ERROR_APPEND 1)

View File

@ -119,11 +119,11 @@
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}-clear-objects
# COMMAND ${CMAKE_COMMAND}
# -E remove ./testfiles/${resultfile}.out ./testfiles/${resultfile}.out.err
# )
add_test (
NAME H5LS-${resultfile}
COMMAND "${CMAKE_COMMAND}"

View File

@ -70,11 +70,11 @@
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}-clear-objects
# COMMAND ${CMAKE_COMMAND}
# -E remove ./testfiles/vds/${resultfile}.out ./testfiles/vds/${resultfile}.out.err
# )
add_test (
NAME H5LS-${resultfile}
COMMAND "${CMAKE_COMMAND}"