diff options
Diffstat (limited to 'Source/CTest/cmCTestConfigureHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestConfigureHandler.cxx | 87 |
1 files changed, 40 insertions, 47 deletions
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx index ea4cf72c2e..b99455fa72 100644 --- a/Source/CTest/cmCTestConfigureHandler.cxx +++ b/Source/CTest/cmCTestConfigureHandler.cxx @@ -18,7 +18,6 @@ #include "cmake.h" #include <cmsys/Process.h> - cmCTestConfigureHandler::cmCTestConfigureHandler() { } @@ -28,64 +27,58 @@ void cmCTestConfigureHandler::Initialize() this->Superclass::Initialize(); } -//clearly it would be nice if this were broken up into a few smaller -//functions and commented... +// clearly it would be nice if this were broken up into a few smaller +// functions and commented... int cmCTestConfigureHandler::ProcessHandler() { cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, - "Configure project" << std::endl, this->Quiet); - std::string cCommand - = this->CTest->GetCTestConfiguration("ConfigureCommand"); - if (cCommand.empty()) - { + "Configure project" << std::endl, this->Quiet); + std::string cCommand = + this->CTest->GetCTestConfiguration("ConfigureCommand"); + if (cCommand.empty()) { cmCTestLog(this->CTest, ERROR_MESSAGE, - "Cannot find ConfigureCommand key in the DartConfiguration.tcl" - << std::endl); + "Cannot find ConfigureCommand key in the DartConfiguration.tcl" + << std::endl); return -1; - } + } - std::string buildDirectory - = this->CTest->GetCTestConfiguration("BuildDirectory"); - if (buildDirectory.empty()) - { + std::string buildDirectory = + this->CTest->GetCTestConfiguration("BuildDirectory"); + if (buildDirectory.empty()) { cmCTestLog(this->CTest, ERROR_MESSAGE, - "Cannot find BuildDirectory key in the DartConfiguration.tcl" - << std::endl); + "Cannot find BuildDirectory key in the DartConfiguration.tcl" + << std::endl); return -1; - } + } double elapsed_time_start = cmSystemTools::GetTime(); std::string output; int retVal = 0; int res = 0; - if ( !this->CTest->GetShowOnly() ) - { + if (!this->CTest->GetShowOnly()) { cmGeneratedFileStream os; - if(!this->StartResultingXML(cmCTest::PartConfigure, "Configure", os)) - { + if (!this->StartResultingXML(cmCTest::PartConfigure, "Configure", os)) { cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open configure file" - << std::endl); + << std::endl); return 1; - } + } std::string start_time = this->CTest->CurrentTime(); - unsigned int start_time_time = static_cast<unsigned int>( - cmSystemTools::GetTime()); + unsigned int start_time_time = + static_cast<unsigned int>(cmSystemTools::GetTime()); cmGeneratedFileStream ofs; this->StartLogFile("Configure", ofs); cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, - "Configure with command: " << cCommand << std::endl, this->Quiet); - res = this->CTest->RunMakeCommand(cCommand.c_str(), output, - &retVal, buildDirectory.c_str(), - 0, ofs); + "Configure with command: " << cCommand << std::endl, + this->Quiet); + res = this->CTest->RunMakeCommand(cCommand.c_str(), output, &retVal, + buildDirectory.c_str(), 0, ofs); - if ( ofs ) - { + if (ofs) { ofs.close(); - } + } - if ( os ) - { + if (os) { cmXMLWriter xml(os); this->CTest->StartXML(xml, this->AppendXML); xml.StartElement("Configure"); @@ -97,23 +90,23 @@ int cmCTestConfigureHandler::ProcessHandler() xml.Element("ConfigureStatus", retVal); xml.Element("EndDateTime", this->CTest->CurrentTime()); xml.Element("EndConfigureTime", - static_cast<unsigned int>(cmSystemTools::GetTime())); - xml.Element("ElapsedMinutes", static_cast<int>( - (cmSystemTools::GetTime() - elapsed_time_start)/6)/10.0); + static_cast<unsigned int>(cmSystemTools::GetTime())); + xml.Element( + "ElapsedMinutes", + static_cast<int>((cmSystemTools::GetTime() - elapsed_time_start) / 6) / + 10.0); xml.EndElement(); // Configure this->CTest->EndXML(xml); - } } - else - { + } else { cmCTestOptionalLog(this->CTest, DEBUG, - "Configure with command: " << cCommand << std::endl, this->Quiet); - } - if (! res || retVal ) - { + "Configure with command: " << cCommand << std::endl, + this->Quiet); + } + if (!res || retVal) { cmCTestLog(this->CTest, ERROR_MESSAGE, - "Error(s) when configuring the project" << std::endl); + "Error(s) when configuring the project" << std::endl); return -1; - } + } return 0; } |