summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-01-27 15:58:33 (GMT)
committerBrad King <brad.king@kitware.com>2009-01-27 15:58:33 (GMT)
commit5527ca5524bebbf9373edf97826fcc4cb3651c59 (patch)
treed3228710857d6843482517f866c7f450ad446579 /Source
parent6ae2f8e7ee589d09582155f156b58a509ae97501 (diff)
downloadCMake-5527ca5524bebbf9373edf97826fcc4cb3651c59.zip
CMake-5527ca5524bebbf9373edf97826fcc4cb3651c59.tar.gz
CMake-5527ca5524bebbf9373edf97826fcc4cb3651c59.tar.bz2
BUG: Reset file submission list on test restart
When running in script mode it is possible to run multiple separate dashboard submissions in one cmCTest instance. The recent refactoring of file submission lists into parts failed to clear the submission lists when starting a new dashboard (ctest_start or ctest_update). Only the unused old submission set was cleared. This fixes the refactored version to remove the old submission set completely and also clear the part-wise lists.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmCTest.cxx5
-rw-r--r--Source/cmCTest.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 1853996..e86fc7a 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -488,7 +488,10 @@ bool cmCTest::InitializeFromCommand(cmCTestCommand* command, bool first)
= this->GetCTestConfiguration("SourceDirectory").c_str();
std::string bld_dir = this->GetCTestConfiguration("BuildDirectory").c_str();
this->DartVersion = 1;
- this->SubmitFiles.clear();
+ for(Part p = PartStart; p != PartCount; p = Part(p+1))
+ {
+ this->Parts[p].SubmitFiles.clear();
+ }
cmMakefile* mf = command->GetMakefile();
std::string fname = src_dir;
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index b949378..7c3d41e 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -478,7 +478,6 @@ private:
int DartVersion;
- std::set<cmStdString> SubmitFiles;
std::vector<cmStdString> InitialCommandLineArguments;
int SubmitIndex;