From: Matthias Maier Date: Thu, 17 Oct 2013 18:15:29 +0000 (+0000) Subject: Cleanup X-Git-Tag: v8.1.0~570^2~27 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bac3c4a387af3498bdf57470c462156f4ac4b2f2;p=dealii.git Cleanup git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31289 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/tests/all-headers/CMakeLists.txt b/deal.II/tests/all-headers/CMakeLists.txt index 607240037a..0018f68d46 100644 --- a/deal.II/tests/all-headers/CMakeLists.txt +++ b/deal.II/tests/all-headers/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE(${DEAL_II_TARGET_CONFIG}) # # Construct a list of all header files and build up a test that just tries # to compile a simple worker (test_header.cc) that only includes the given -# header file. We omit linking to safe some time. +# header file. We omit linking to save some time. # SET(_category all-headers) diff --git a/deal.II/tests/build_tests/CMakeLists.txt b/deal.II/tests/build_tests/CMakeLists.txt index 08aed09078..e0beebfc1e 100644 --- a/deal.II/tests/build_tests/CMakeLists.txt +++ b/deal.II/tests/build_tests/CMakeLists.txt @@ -86,6 +86,7 @@ FOREACH(_step_full ${_steps}) # And a rule on how to configure the example step: ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/configure_output + COMMAND rm -f ${_step_dir}/failing_configure_output COMMAND ${CMAKE_COMMAND} -DDEAL_II_DIR=${DEAL_II_BINARY_DIR} -DCMAKE_BUILD_TYPE=${_build} . > ${_step_dir}/configure_output 2>&1 @@ -101,8 +102,9 @@ FOREACH(_step_full ${_steps}) # And a rule on how to build the example step: ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/build_output COMMAND [ ! -f ${_step_dir}/configure_output ] - || ${CMAKE_COMMAND} --build ${_step_dir} --target all - > ${_step_dir}/build_output 2>&1 + || (rm -f ${_step_dir}/failing_build_output + &&${CMAKE_COMMAND} --build ${_step_dir} --target all + > ${_step_dir}/build_output 2>&1) || (mv ${_step_dir}/build_output ${_step_dir}/failing_build_output && echo "${_test}: CONFIGURE successful." @@ -120,8 +122,9 @@ FOREACH(_step_full ${_steps}) # And a rule on how to run the example step: ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/run_output COMMAND [ ! -f ${_step_dir}/build_output ] - || ${CMAKE_COMMAND} --build ${_step_dir} --target run - > ${_step_dir}/run_output 2>&1 + || (rm -f ${_step_dir}/failing_run_output + && ${CMAKE_COMMAND} --build ${_step_dir} --target run + > ${_step_dir}/run_output 2>&1) || (mv ${_step_dir}/run_output ${_step_dir}/failing_run_output && echo "${_test}: CONFIGURE successful."