[Cmake-commits] [cmake-commits] king committed cmCTestBuildHandler.cxx 1.63 1.64 cmCTestConfigureHandler.cxx 1.15 1.16 cmCTestCoverageHandler.cxx 1.57 1.58 cmCTestGenericHandler.cxx 1.18 1.19 cmCTestGenericHandler.h 1.11 1.12 cmCTestHandlerCommand.cxx 1.14 1.15 cmCTestHandlerCommand.h 1.5 1.6 cmCTestMemCheckHandler.cxx 1.19 1.20 cmCTestTestHandler.cxx 1.85 1.86
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jan 12 09:11:31 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv20133/Source/CTest
Modified Files:
cmCTestBuildHandler.cxx cmCTestConfigureHandler.cxx
cmCTestCoverageHandler.cxx cmCTestGenericHandler.cxx
cmCTestGenericHandler.h cmCTestHandlerCommand.cxx
cmCTestHandlerCommand.h cmCTestMemCheckHandler.cxx
cmCTestTestHandler.cxx
Log Message:
ENH: Teach ctest_* to create appending XML files
This adds an APPEND option to the ctest_* commands which tells them to
put the Append="true" attribute in the Site element of their XML file.
Index: cmCTestGenericHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestGenericHandler.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** cmCTestGenericHandler.h 28 Apr 2006 15:59:31 -0000 1.11
--- cmCTestGenericHandler.h 12 Jan 2009 14:11:29 -0000 1.12
***************
*** 89,96 ****
--- 89,99 ----
int GetSubmitIndex() { return this->SubmitIndex; }
+ void SetAppendXML(bool b) { this->AppendXML = b; }
+
protected:
bool StartResultingXML(const char* name, cmGeneratedFileStream& xofs);
bool StartLogFile(const char* name, cmGeneratedFileStream& xofs);
+ bool AppendXML;
bool HandlerVerbose;
cmCTest *CTest;
Index: cmCTestMemCheckHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMemCheckHandler.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** cmCTestMemCheckHandler.cxx 30 Jan 2008 16:17:36 -0000 1.19
--- cmCTestMemCheckHandler.cxx 12 Jan 2009 14:11:29 -0000 1.20
***************
*** 288,292 ****
}
! this->CTest->StartXML(os);
os << "<DynamicAnalysis Checker=\"";
switch ( this->MemoryTesterStyle )
--- 288,292 ----
}
! this->CTest->StartXML(os, this->AppendXML);
os << "<DynamicAnalysis Checker=\"";
switch ( this->MemoryTesterStyle )
Index: cmCTestGenericHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestGenericHandler.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** cmCTestGenericHandler.cxx 30 Dec 2008 14:13:02 -0000 1.18
--- cmCTestGenericHandler.cxx 12 Jan 2009 14:11:29 -0000 1.19
***************
*** 27,30 ****
--- 27,31 ----
this->CTest = 0;
this->SubmitIndex = 0;
+ this->AppendXML = false;
}
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.63
retrieving revision 1.64
diff -C 2 -d -r1.63 -r1.64
*** cmCTestBuildHandler.cxx 9 Oct 2008 17:00:31 -0000 1.63
--- cmCTestBuildHandler.cxx 12 Jan 2009 14:11:29 -0000 1.64
***************
*** 485,489 ****
double elapsed_build_time)
{
! this->CTest->StartXML(os);
os << "<Build>\n"
<< "\t<StartDateTime>" << this->StartBuild << "</StartDateTime>\n"
--- 485,489 ----
double elapsed_build_time)
{
! this->CTest->StartXML(os, this->AppendXML);
os << "<Build>\n"
<< "\t<StartDateTime>" << this->StartBuild << "</StartDateTime>\n"
Index: cmCTestHandlerCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestHandlerCommand.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** cmCTestHandlerCommand.cxx 12 Jan 2009 14:10:47 -0000 1.14
--- cmCTestHandlerCommand.cxx 12 Jan 2009 14:11:29 -0000 1.15
***************
*** 34,37 ****
--- 34,38 ----
this->Arguments[ct_SUBMIT_INDEX] = "SUBMIT_INDEX";
this->Last = ct_LAST;
+ this->AppendXML = false;
}
***************
*** 74,77 ****
--- 75,80 ----
}
+ handler->SetAppendXML(this->AppendXML);
+
handler->PopulateCustomVectors(this->Makefile);
if ( this->Values[ct_BUILD] )
***************
*** 144,147 ****
--- 147,158 ----
bool cmCTestHandlerCommand::CheckArgumentKeyword(std::string const& arg)
{
+ // Look for non-value arguments common to all commands.
+ if(arg == "APPEND")
+ {
+ this->ArgumentDoing = ArgumentDoingNone;
+ this->AppendXML = true;
+ return true;
+ }
+
// Check for a keyword in our argument/value table.
for(unsigned int k=0; k < this->Arguments.size(); ++k)
Index: cmCTestConfigureHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestConfigureHandler.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** cmCTestConfigureHandler.cxx 30 Dec 2008 14:13:02 -0000 1.15
--- cmCTestConfigureHandler.cxx 12 Jan 2009 14:11:29 -0000 1.16
***************
*** 93,97 ****
if ( os )
{
! this->CTest->StartXML(os);
os << "<Configure>\n"
<< "\t<StartDateTime>" << start_time << "</StartDateTime>"
--- 93,97 ----
if ( os )
{
! this->CTest->StartXML(os, this->AppendXML);
os << "<Configure>\n"
<< "\t<StartDateTime>" << start_time << "</StartDateTime>"
Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.57
retrieving revision 1.58
diff -C 2 -d -r1.57 -r1.58
*** cmCTestCoverageHandler.cxx 23 Nov 2008 15:49:46 -0000 1.57
--- cmCTestCoverageHandler.cxx 12 Jan 2009 14:11:29 -0000 1.58
***************
*** 170,174 ****
}
std::string local_start_time = this->CTest->CurrentTime();
! this->CTest->StartXML(covLogFile);
covLogFile << "<CoverageLog>" << std::endl
<< "\t<StartDateTime>" << local_start_time << "</StartDateTime>"
--- 170,174 ----
}
std::string local_start_time = this->CTest->CurrentTime();
! this->CTest->StartXML(covLogFile, this->AppendXML);
covLogFile << "<CoverageLog>" << std::endl
<< "\t<StartDateTime>" << local_start_time << "</StartDateTime>"
***************
*** 389,393 ****
}
! this->CTest->StartXML(covSumFile);
// Produce output xml files
--- 389,393 ----
}
! this->CTest->StartXML(covSumFile, this->AppendXML);
// Produce output xml files
***************
*** 1441,1445 ****
return 0;
}
! this->CTest->StartXML(covSumFile);
double elapsed_time_start = cmSystemTools::GetTime();
std::string coverage_start_time = this->CTest->CurrentTime();
--- 1441,1445 ----
return 0;
}
! this->CTest->StartXML(covSumFile, this->AppendXML);
double elapsed_time_start = cmSystemTools::GetTime();
std::string coverage_start_time = this->CTest->CurrentTime();
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.85
retrieving revision 1.86
diff -C 2 -d -r1.85 -r1.86
*** cmCTestTestHandler.cxx 7 Jan 2009 15:41:37 -0000 1.85
--- cmCTestTestHandler.cxx 12 Jan 2009 14:11:29 -0000 1.86
***************
*** 1443,1447 ****
}
! this->CTest->StartXML(os);
os << "<Testing>\n"
<< "\t<StartDateTime>" << this->StartTest << "</StartDateTime>\n"
--- 1443,1447 ----
}
! this->CTest->StartXML(os, this->AppendXML);
os << "<Testing>\n"
<< "\t<StartDateTime>" << this->StartTest << "</StartDateTime>\n"
Index: cmCTestHandlerCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestHandlerCommand.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmCTestHandlerCommand.h 12 Jan 2009 14:10:47 -0000 1.5
--- cmCTestHandlerCommand.h 12 Jan 2009 14:11:29 -0000 1.6
***************
*** 67,70 ****
--- 67,72 ----
unsigned int ArgumentIndex;
+ bool AppendXML;
+
std::string ReturnVariable;
std::vector<const char*> Arguments;
More information about the Cmake-commits
mailing list