From 5527ca5524bebbf9373edf97826fcc4cb3651c59 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 27 Jan 2009 10:58:33 -0500 Subject: [PATCH] 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. --- Source/cmCTest.cxx | 5 ++++- Source/cmCTest.h | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 1853996e3..e86fc7add 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 b949378d0..7c3d41e14 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -478,7 +478,6 @@ private: int DartVersion; - std::set SubmitFiles; std::vector InitialCommandLineArguments; int SubmitIndex;