diff options
author | Brad King <brad.king@kitware.com> | 2009-01-12 15:37:55 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-01-12 15:37:55 (GMT) |
commit | 447f5b303eab1b076f49ed52af90e554160dddc6 (patch) | |
tree | 6e27fdd66c1b7d39440d94681457c2765a957a99 /Source/cmCTest.cxx | |
parent | 4b97fab34d07afe05b057dbb6b2c64f4f0d24f40 (diff) | |
download | CMake-447f5b303eab1b076f49ed52af90e554160dddc6.zip CMake-447f5b303eab1b076f49ed52af90e554160dddc6.tar.gz CMake-447f5b303eab1b076f49ed52af90e554160dddc6.tar.bz2 |
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.
Diffstat (limited to 'Source/cmCTest.cxx')
-rw-r--r-- | Source/cmCTest.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 7d3a7cb..5e2406b 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -269,6 +269,7 @@ cmCTest::cmCTest() this->Parts[PartMemCheck].SetName("MemCheck"); this->Parts[PartSubmit].SetName("Submit"); this->Parts[PartNotes].SetName("Notes"); + this->Parts[PartExtraFiles].SetName("ExtraFiles"); // Fill the part name-to-id map. for(Part p = PartStart; p != PartCount; p = Part(p+1)) @@ -734,11 +735,11 @@ bool cmCTest::OpenOutputFile(const std::string& path, } //---------------------------------------------------------------------- -bool cmCTest::AddIfExists(SetOfStrings& files, const char* file) +bool cmCTest::AddIfExists(Part part, const char* file) { if ( this->CTestFileExists(file) ) { - files.insert(file); + this->AddSubmitFile(part, file); } else { @@ -746,7 +747,7 @@ bool cmCTest::AddIfExists(SetOfStrings& files, const char* file) name += ".gz"; if ( this->CTestFileExists(name.c_str()) ) { - files.insert(name.c_str()); + this->AddSubmitFile(part, file); } else { @@ -1448,7 +1449,7 @@ bool cmCTest::SubmitExtraFiles(const std::vector<cmStdString> &files) << std::endl;); return false; } - this->AddSubmitFile(it->c_str()); + this->AddSubmitFile(PartExtraFiles, it->c_str()); } return true; } @@ -2436,9 +2437,9 @@ void cmCTest::SetSpecificTrack(const char* track) } //---------------------------------------------------------------------- -void cmCTest::AddSubmitFile(const char* name) +void cmCTest::AddSubmitFile(Part part, const char* name) { - this->SubmitFiles.insert(name); + this->Parts[part].SubmitFiles.push_back(name); } //---------------------------------------------------------------------- |