diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-09-21 17:40:40 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-09-21 17:40:40 (GMT) |
| commit | e4293b4b389cbe4f15f03ff00e434d98e727e20a (patch) | |
| tree | e7215a4e82c08ed2265e1a9069a0c8c942db94e4 | |
| parent | 43499b1ecb946dbee0c1f93771e2b6ed7adea02f (diff) | |
| download | CMake-e4293b4b389cbe4f15f03ff00e434d98e727e20a.zip CMake-e4293b4b389cbe4f15f03ff00e434d98e727e20a.tar.gz CMake-e4293b4b389cbe4f15f03ff00e434d98e727e20a.tar.bz2 | |
Re-enabled failing tests; fixed ctest_build output to be consistent in the error condition across different make programs so that these tests would pass.
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 11 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 34 |
2 files changed, 23 insertions, 22 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index f998235..5cab628 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -445,11 +445,6 @@ int cmCTestBuildHandler::ProcessHandler() this->EndBuild = this->CTest->CurrentTime(); this->EndBuildTime = cmSystemTools::GetTime(); double elapsed_build_time = cmSystemTools::GetTime() - elapsed_time_start; - if (res != cmsysProcess_State_Exited || retVal ) - { - cmCTestLog(this->CTest, ERROR_MESSAGE, "Error(s) when building project" - << std::endl); - } // Cleanups strings in the errors and warnings list. t_ErrorsAndWarningsVector::iterator evit; @@ -502,6 +497,12 @@ int cmCTestBuildHandler::ProcessHandler() } this->GenerateXMLFooter(xofs, elapsed_build_time); + if (res != cmsysProcess_State_Exited || retVal || this->TotalErrors > 0) + { + cmCTestLog(this->CTest, ERROR_MESSAGE, "Error(s) when building project" + << std::endl); + } + // Display message about number of errors and warnings cmCTestLog(this->CTest, HANDLER_OUTPUT, " " << this->TotalErrors << (this->TotalErrors >= this->MaxErrors ? " or more" : "") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5218ed1..09ec374 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1052,24 +1052,24 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoBuild.cmake.in" "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" @ONLY ESCAPE_QUOTES) - #ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND} - # -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V - # --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log" - # ) - #SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES - # FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true) + ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND} + -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V + --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log" + ) + SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES + FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true) - #CONFIGURE_FILE( - # "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in" -# "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -# @ONLY ESCAPE_QUOTES) -# ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND} -# -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V -# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log" -# ) -# SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild -# PASS_REGULAR_EXPRESSION "Could not find executable" -# FAIL_REGULAR_EXPRESSION "SegFault") + CONFIGURE_FILE( + "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in" + "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" + @ONLY ESCAPE_QUOTES) + ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND} + -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V + --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log" + ) + SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild + PASS_REGULAR_EXPRESSION "Could not find executable" + FAIL_REGULAR_EXPRESSION "SegFault") CONFIGURE_FILE( "${CMake_SOURCE_DIR}/Tests/CTestTestCrash/test.cmake.in" |