diff options
| author | Brad King <brad.king@kitware.com> | 2009-02-04 19:34:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-02-04 19:34:25 (GMT) |
| commit | d18ae05da1c303547161065d3030fc45838e1950 (patch) | |
| tree | 107f199ac1e0434de7bed8445877487690cceadf | |
| parent | 5f65e04ea2f348bd4584a14afa32a32725f77ce4 (diff) | |
| download | CMake-d18ae05da1c303547161065d3030fc45838e1950.zip CMake-d18ae05da1c303547161065d3030fc45838e1950.tar.gz CMake-d18ae05da1c303547161065d3030fc45838e1950.tar.bz2 | |
ENH: Re-order generation of build summary and xml
This moves the error/warning count summary printed by
cmCTestBuildHandler to after Build.xml is generated. Later we will
compute the counts during generation of the xml.
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 5b5c68e..9e67f73 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -457,14 +457,6 @@ int cmCTestBuildHandler::ProcessHandler() } } - // Display message about number of errors and warnings - cmCTestLog(this->CTest, HANDLER_OUTPUT, " " << this->TotalErrors - << (this->TotalErrors >= this->MaxErrors ? " or more" : "") - << " Compiler errors" << std::endl); - cmCTestLog(this->CTest, HANDLER_OUTPUT, " " << this->TotalWarnings - << (this->TotalWarnings >= this->MaxWarnings ? " or more" : "") - << " Compiler warnings" << std::endl); - // Generate XML output cmGeneratedFileStream xofs; if(!this->StartResultingXML(cmCTest::PartBuild, "Build", xofs)) @@ -476,6 +468,15 @@ int cmCTestBuildHandler::ProcessHandler() this->GenerateXMLHeader(xofs); this->GenerateXMLLogScraped(xofs); this->GenerateXMLFooter(xofs, elapsed_build_time); + + // Display message about number of errors and warnings + cmCTestLog(this->CTest, HANDLER_OUTPUT, " " << this->TotalErrors + << (this->TotalErrors >= this->MaxErrors ? " or more" : "") + << " Compiler errors" << std::endl); + cmCTestLog(this->CTest, HANDLER_OUTPUT, " " << this->TotalWarnings + << (this->TotalWarnings >= this->MaxWarnings ? " or more" : "") + << " Compiler warnings" << std::endl); + return retVal; } |