kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmCTestConfigureHandler: Port to cmXMLWriter

This commit is contained in:
Daniel Pfeifer 2015-05-23 23:41:09 +02:00 committed by Brad King
parent 6cf5cc717f
commit 9c0bb7d807
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/CTest/cmCTestConfigureHandler.cxx
View File

@ -15,7 +15,7 @@
#include "cmCTest.h" #include "cmCTest.h"
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmake.h" #include "cmake.h"
#include "cmXMLSafe.h" #include "cmXMLWriter.h"
#include <cmsys/Process.h> #include <cmsys/Process.h>
@ -89,28 +89,22 @@ int cmCTestConfigureHandler::ProcessHandler()
if ( os ) if ( os )
{ {
this->CTest->StartXML(os, this->AppendXML); cmXMLWriter xml(os);
os << "<Configure>\n" this->CTest->StartXML(xml, this->AppendXML);
<< "\t<StartDateTime>" << start_time << "</StartDateTime>" xml.StartElement("Configure");
<< std::endl xml.Element("StartDateTime", start_time);
<< "\t<StartConfigureTime>" << start_time_time xml.Element("StartConfigureTime", start_time_time);
<< "</StartConfigureTime>\n"; xml.Element("ConfigureCommand", cCommand);
os << "<ConfigureCommand>" << cCommand << "</ConfigureCommand>"
<< std::endl;
cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet); cmCTestOptionalLog(this->CTest, DEBUG, "End" << std::endl, this->Quiet);
os << "<Log>" << cmXMLSafe(output) << "</Log>" << std::endl; xml.Element("Log", output);
std::string end_time = this->CTest->CurrentTime(); xml.Element("ConfigureStatus", retVal);
os << "\t<ConfigureStatus>" << retVal << "</ConfigureStatus>\n" xml.Element("EndDateTime", this->CTest->CurrentTime());
<< "\t<EndDateTime>" << end_time << "</EndDateTime>\n" xml.Element("EndConfigureTime",
<< "\t<EndConfigureTime>" << static_cast<unsigned int>(cmSystemTools::GetTime()));
static_cast<unsigned int>(cmSystemTools::GetTime()) xml.Element("ElapsedMinutes", static_cast<int>(
<< "</EndConfigureTime>\n" (cmSystemTools::GetTime() - elapsed_time_start)/6)/10.0);
<< "<ElapsedMinutes>" xml.EndElement(); // Configure
<< static_cast<int>( this->CTest->EndXML(xml);
(cmSystemTools::GetTime() - elapsed_time_start)/6)/10.0
<< "</ElapsedMinutes>"
<< "</Configure>" << std::endl;
this->CTest->EndXML(os);
} }
} }
else else