diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-03 19:50:41 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-03 19:50:41 (GMT) |
| commit | 869ef118e914f127e9f1a2f949b760f1585dba0f (patch) | |
| tree | bf2007ff8498b407eeff5a2b234498acf94dad8f | |
| parent | 620bfd58ae44dcf876303efb99482019ebbb9b6a (diff) | |
| download | hdf5-869ef118e914f127e9f1a2f949b760f1585dba0f.zip hdf5-869ef118e914f127e9f1a2f949b760f1585dba0f.tar.gz hdf5-869ef118e914f127e9f1a2f949b760f1585dba0f.tar.bz2 | |
Move clear-objects inside runTest
| -rw-r--r-- | config/cmake_ext_mod/runTest.cmake | 8 | ||||
| -rw-r--r-- | tools/h5ls/CMakeTests.cmake | 10 | ||||
| -rw-r--r-- | tools/h5ls/CMakeTestsVDS.cmake | 10 |
3 files changed, 18 insertions, 10 deletions
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake index 21a65e6..8b47693 100644 --- a/config/cmake_ext_mod/runTest.cmake +++ b/config/cmake_ext_mod/runTest.cmake @@ -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) diff --git a/tools/h5ls/CMakeTests.cmake b/tools/h5ls/CMakeTests.cmake index 2367df8..4e6a08f 100644 --- a/tools/h5ls/CMakeTests.cmake +++ b/tools/h5ls/CMakeTests.cmake @@ -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}" diff --git a/tools/h5ls/CMakeTestsVDS.cmake b/tools/h5ls/CMakeTestsVDS.cmake index e6c216d..240eed0 100644 --- a/tools/h5ls/CMakeTestsVDS.cmake +++ b/tools/h5ls/CMakeTestsVDS.cmake @@ -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}" |