From: Matthias Maier Date: Wed, 25 Oct 2017 15:40:27 +0000 (-0500) Subject: Revert "Avoid numdiff check race condition in test" X-Git-Tag: v9.0.0-rc1~880^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cd3c52f374fa8b059f561427fa1e3d013a7fd7d;p=dealii.git Revert "Avoid numdiff check race condition in test" This reverts commit 41d4678230e24635583eb892fdf473c5d6847a05. --- diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake index 3284f6dc21..1ce3748519 100644 --- a/cmake/macros/macro_deal_ii_pickup_tests.cmake +++ b/cmake/macros/macro_deal_ii_pickup_tests.cmake @@ -164,10 +164,11 @@ MACRO(DEAL_II_PICKUP_TESTS) RESULT_VARIABLE _numdiff_tolerance_test_status ) - # Note: We do not remove the test files to avoid a race condition if - # cmake decides to rerun in a concurrent situation: - # FILE(REMOVE ${_first_test_file_name}) - # FILE(REMOVE ${_second_test_file_name}) + # + # Tidy up: + # + FILE(REMOVE ${_first_test_file_name}) + FILE(REMOVE ${_second_test_file_name}) IF(NOT "${_numdiff_tolerance_test_status}" STREQUAL "0") MESSAGE(FATAL_ERROR