From: maier Date: Sun, 20 Oct 2013 14:13:58 +0000 (+0000) Subject: Bugfix X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f066acfb3d290bcd9061cfd366633bf98e59f3f;p=dealii-svn.git Bugfix git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31334 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/scripts/run_test.cmake b/deal.II/cmake/scripts/run_test.cmake index 68f3a964f0..8ffb2eabf8 100644 --- a/deal.II/cmake/scripts/run_test.cmake +++ b/deal.II/cmake/scripts/run_test.cmake @@ -44,26 +44,24 @@ ELSE() # Determine whether the CONFIGURE, BUILD or RUN stages were run successfully: # - # CONFIGURE is special because it only exists in build tests: - STRING(REGEX MATCH "${TEST}: CONFIGURE successful\\." _configure_regex ${_output}) - STRING(REGEX MATCH "${TEST}: CONFIGURE failed\\." _configure_regex_fail ${_output}) - STRING(REGEX MATCH "${TEST}: BUILD successful\\." _build_regex ${_output}) - STRING(REGEX MATCH "${TEST}: RUN failed\\." _run_regex_fail ${_output}) - STRING(REGEX MATCH "${TEST}: RUN successful\\." _run_regex ${_output}) - IF(NOT "${_configure_regex_fail}" STREQUAL "") + STRING(REGEX MATCH "${TEST}: CONFIGURE failed\\." _configure_regex ${_output}) + STRING(REGEX MATCH "${TEST}: BUILD failed\\." _build_regex ${_output}) + STRING(REGEX MATCH "${TEST}: RUN failed\\." _run_regex ${_output}) + STRING(REGEX MATCH "${TEST}: DIFF failed\\." _diff_regex ${_output}) + + IF(NOT "${_configure_regex}" STREQUAL "") SET(_stage CONFIGURE) - ELSEIF("${_build_regex}" STREQUAL "" AND "${_run_regex_fail}" STREQUAL "") - SET(_stage BUILD) - ELSEIF("${_run_regex}" STREQUAL "") + ELSEIF(NOT "${_run_regex}" STREQUAL "") SET(_stage RUN) - ELSE() + ELSEIF(NOT "${_diff_regex}" STREQUAL "") SET(_stage DIFF) + ELSE() # unconditionally, because "BUILD failed." doesn't have to be printed... + SET(_stage BUILD) ENDIF() MESSAGE("Test ${TEST}: ${_stage}") MESSAGE("=============================== OUTPUT BEGIN ===============================") - IF( "${_build_regex}" STREQUAL "" AND - "${_configure_regex}" STREQUAL "" ) + IF( "${_stage}" STREQUAL "BUILD" AND "${_build_regex}" STREQUAL "" ) # Some special output in case the BUILD stage failed in a regression test: MESSAGE("${TEST}: BUILD failed. Output:") ENDIF()