From d18ae05da1c303547161065d3030fc45838e1950 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 4 Feb 2009 14:34:25 -0500 Subject: [PATCH] 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. --- Source/CTest/cmCTestBuildHandler.cxx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 5b5c68ec8..9e67f73dd 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; }