[Cmake-commits] [cmake-commits] king committed cmCTestBuildHandler.cxx 1.64 1.65 cmCTestConfigureHandler.cxx 1.16 1.17 cmCTestCoverageHandler.cxx 1.58 1.59 cmCTestGenericHandler.cxx 1.19 1.20 cmCTestGenericHandler.h 1.12 1.13 cmCTestSubmitHandler.cxx 1.31 1.32 cmCTestTestHandler.cxx 1.86 1.87 cmCTestUpdateHandler.cxx 1.49 1.50
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jan 12 10:37:57 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv10105/Source/CTest
Modified Files:
cmCTestBuildHandler.cxx cmCTestConfigureHandler.cxx
cmCTestCoverageHandler.cxx cmCTestGenericHandler.cxx
cmCTestGenericHandler.h cmCTestSubmitHandler.cxx
cmCTestTestHandler.cxx cmCTestUpdateHandler.cxx
Log Message:
ENH: Divide CTest file submission list by part
This splits the list of files for CTest to submit into those belonging
to each part. The set is recombined just before submission. Later this
will allow piecewise submissions.
Index: cmCTestGenericHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestGenericHandler.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmCTestGenericHandler.h 12 Jan 2009 14:11:29 -0000 1.12
--- cmCTestGenericHandler.h 12 Jan 2009 15:37:55 -0000 1.13
***************
*** 21,26 ****
#include "cmObject.h"
- class cmCTest;
class cmMakefile;
class cmCTestCommand;
--- 21,26 ----
#include "cmObject.h"
+ #include "cmCTest.h"
class cmMakefile;
class cmCTestCommand;
***************
*** 92,96 ****
protected:
! bool StartResultingXML(const char* name, cmGeneratedFileStream& xofs);
bool StartLogFile(const char* name, cmGeneratedFileStream& xofs);
--- 92,97 ----
protected:
! bool StartResultingXML(cmCTest::Part part,
! const char* name, cmGeneratedFileStream& xofs);
bool StartLogFile(const char* name, cmGeneratedFileStream& xofs);
Index: cmCTestSubmitHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSubmitHandler.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** cmCTestSubmitHandler.cxx 4 Mar 2008 18:34:21 -0000 1.31
--- cmCTestSubmitHandler.cxx 12 Jan 2009 15:37:55 -0000 1.32
***************
*** 853,865 ****
this->StartLogFile("Submit", ofs);
- cmCTest::SetOfStrings files;
std::string prefix = this->GetSubmitResultsPrefix();
// TODO:
// Check if test is enabled
! this->CTest->AddIfExists(files, "Update.xml");
! this->CTest->AddIfExists(files, "Configure.xml");
! this->CTest->AddIfExists(files, "Build.xml");
! this->CTest->AddIfExists(files, "Test.xml");
! if ( this->CTest->AddIfExists(files, "Coverage.xml") )
{
cmCTest::VectorOfStrings gfiles;
--- 853,864 ----
this->StartLogFile("Submit", ofs);
std::string prefix = this->GetSubmitResultsPrefix();
// TODO:
// Check if test is enabled
! this->CTest->AddIfExists(cmCTest::PartUpdate, "Update.xml");
! this->CTest->AddIfExists(cmCTest::PartConfigure, "Configure.xml");
! this->CTest->AddIfExists(cmCTest::PartBuild, "Build.xml");
! this->CTest->AddIfExists(cmCTest::PartTest, "Test.xml");
! if(this->CTest->AddIfExists(cmCTest::PartCoverage, "Coverage.xml"))
{
cmCTest::VectorOfStrings gfiles;
***************
*** 878,882 ****
cmCTestLog(this->CTest, DEBUG, "Glob file: " << gfiles[cc].c_str()
<< std::endl);
! files.insert(gfiles[cc]);
}
}
--- 877,881 ----
cmCTestLog(this->CTest, DEBUG, "Glob file: " << gfiles[cc].c_str()
<< std::endl);
! this->CTest->AddSubmitFile(cmCTest::PartCoverage, gfiles[cc].c_str());
}
}
***************
*** 886,899 ****
}
}
! this->CTest->AddIfExists(files, "DynamicAnalysis.xml");
! this->CTest->AddIfExists(files, "Purify.xml");
! this->CTest->AddIfExists(files, "Notes.xml");
! cmCTest::SetOfStrings::iterator it;
! for ( it = this->CTest->GetSubmitFiles()->begin();
! it != this->CTest->GetSubmitFiles()->end();
! ++ it )
{
! files.insert(files.end(), *it);
}
--- 885,903 ----
}
}
! this->CTest->AddIfExists(cmCTest::PartMemCheck, "DynamicAnalysis.xml");
! this->CTest->AddIfExists(cmCTest::PartMemCheck, "Purify.xml");
! this->CTest->AddIfExists(cmCTest::PartNotes, "Notes.xml");
! // Query parts for files to submit.
! cmCTest::SetOfStrings files;
! for(cmCTest::Part p = cmCTest::PartStart;
! p != cmCTest::PartCount; p = cmCTest::Part(p+1))
{
! std::vector<std::string> const& pfiles = this->CTest->GetSubmitFiles(p);
! for(std::vector<std::string>::const_iterator pi = pfiles.begin();
! pi != pfiles.end(); ++pi)
! {
! files.insert(*pi);
! }
}
***************
*** 902,905 ****
--- 906,910 ----
ofs << "Upload files:" << std::endl;
int cnt = 0;
+ cmCTest::SetOfStrings::iterator it;
for ( it = files.begin(); it != files.end(); ++ it )
{
Index: cmCTestConfigureHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestConfigureHandler.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** cmCTestConfigureHandler.cxx 12 Jan 2009 14:11:29 -0000 1.16
--- cmCTestConfigureHandler.cxx 12 Jan 2009 15:37:55 -0000 1.17
***************
*** 68,72 ****
{
cmGeneratedFileStream os;
! if ( !this->StartResultingXML("Configure", os) )
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open configure file"
--- 68,72 ----
{
cmGeneratedFileStream os;
! if(!this->StartResultingXML(cmCTest::PartConfigure, "Configure", os))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open configure file"
Index: cmCTestGenericHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestGenericHandler.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** cmCTestGenericHandler.cxx 12 Jan 2009 14:11:29 -0000 1.19
--- cmCTestGenericHandler.cxx 12 Jan 2009 15:37:55 -0000 1.20
***************
*** 105,110 ****
//----------------------------------------------------------------------
! bool cmCTestGenericHandler::StartResultingXML(const char* name,
! cmGeneratedFileStream& xofs)
{
if ( !name )
--- 105,111 ----
//----------------------------------------------------------------------
! bool cmCTestGenericHandler::StartResultingXML(cmCTest::Part part,
! const char* name,
! cmGeneratedFileStream& xofs)
{
if ( !name )
***************
*** 140,144 ****
return false;
}
! this->CTest->AddSubmitFile(ostr.str().c_str());
return true;
}
--- 141,145 ----
return false;
}
! this->CTest->AddSubmitFile(part, ostr.str().c_str());
return true;
}
Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.58
retrieving revision 1.59
diff -C 2 -d -r1.58 -r1.59
*** cmCTestCoverageHandler.cxx 12 Jan 2009 14:11:29 -0000 1.58
--- cmCTestCoverageHandler.cxx 12 Jan 2009 15:37:55 -0000 1.59
***************
*** 163,167 ****
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Open file: "
<< covLogFilename << std::endl);
! if (!this->StartResultingXML(covLogFilename, covLogFile) )
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
--- 163,168 ----
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Open file: "
<< covLogFilename << std::endl);
! if(!this->StartResultingXML(cmCTest::PartCoverage,
! covLogFilename, covLogFile))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file: "
***************
*** 382,386 ****
cmGeneratedFileStream covLogFile;
! if (!this->StartResultingXML("Coverage", covSumFile))
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
--- 383,387 ----
cmGeneratedFileStream covLogFile;
! if(!this->StartResultingXML(cmCTest::PartCoverage, "Coverage", covSumFile))
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
***************
*** 1435,1439 ****
// copen the Coverage.xml file in the Testing directory
cmGeneratedFileStream covSumFile;
! if (!this->StartResultingXML("Coverage", covSumFile))
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
--- 1436,1440 ----
// copen the Coverage.xml file in the Testing directory
cmGeneratedFileStream covSumFile;
! if(!this->StartResultingXML(cmCTest::PartCoverage, "Coverage", covSumFile))
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.49
retrieving revision 1.50
diff -C 2 -d -r1.49 -r1.50
*** cmCTestUpdateHandler.cxx 6 Jan 2009 19:58:30 -0000 1.49
--- cmCTestUpdateHandler.cxx 12 Jan 2009 15:37:55 -0000 1.50
***************
*** 579,583 ****
//
cmGeneratedFileStream os;
! if ( !this->StartResultingXML("Update", os) )
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
--- 579,583 ----
//
cmGeneratedFileStream os;
! if(!this->StartResultingXML(cmCTest::PartUpdate, "Update", os))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open log file"
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.86
retrieving revision 1.87
diff -C 2 -d -r1.86 -r1.87
*** cmCTestTestHandler.cxx 12 Jan 2009 14:11:29 -0000 1.86
--- cmCTestTestHandler.cxx 12 Jan 2009 15:37:55 -0000 1.87
***************
*** 593,596 ****
--- 593,597 ----
cmGeneratedFileStream xmlfile;
if( !this->StartResultingXML(
+ (this->MemCheck ? cmCTest::PartMemCheck : cmCTest::PartTest),
(this->MemCheck ? "DynamicAnalysis" : "Test"), xmlfile) )
{
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.64
retrieving revision 1.65
diff -C 2 -d -r1.64 -r1.65
*** cmCTestBuildHandler.cxx 12 Jan 2009 14:11:29 -0000 1.64
--- cmCTestBuildHandler.cxx 12 Jan 2009 15:37:55 -0000 1.65
***************
*** 468,472 ****
// Generate XML output
cmGeneratedFileStream xofs;
! if( !this->StartResultingXML("Build", xofs))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot create build XML file"
--- 468,472 ----
// Generate XML output
cmGeneratedFileStream xofs;
! if(!this->StartResultingXML(cmCTest::PartBuild, "Build", xofs))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot create build XML file"
More information about the Cmake-commits
mailing list