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 /Source | |
| 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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 11 |
1 files changed, 6 insertions, 5 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" : "") |