[Cmake-commits] [cmake-commits] king committed cmCTest.cxx 1.351 1.352 cmCTest.h 1.111 1.112

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv25637/Source

Modified Files:
	cmCTest.cxx cmCTest.h 
Log Message:
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.


Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -C 2 -d -r1.111 -r1.112
*** cmCTest.h	18 Jan 2009 18:03:31 -0000	1.111
--- cmCTest.h	27 Jan 2009 15:58:33 -0000	1.112
***************
*** 479,483 ****
    int  DartVersion;
  
-   std::set<cmStdString> SubmitFiles;
    std::vector<cmStdString> InitialCommandLineArguments;
  
--- 479,482 ----

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.351
retrieving revision 1.352
diff -C 2 -d -r1.351 -r1.352
*** cmCTest.cxx	18 Jan 2009 18:03:32 -0000	1.351
--- cmCTest.cxx	27 Jan 2009 15:58:33 -0000	1.352
***************
*** 489,493 ****
    std::string bld_dir = this->GetCTestConfiguration("BuildDirectory").c_str();
    this->DartVersion = 1;
!   this->SubmitFiles.clear();
  
    cmMakefile* mf = command->GetMakefile();
--- 489,496 ----
    std::string bld_dir = this->GetCTestConfiguration("BuildDirectory").c_str();
    this->DartVersion = 1;
!   for(Part p = PartStart; p != PartCount; p = Part(p+1))
!     {
!     this->Parts[p].SubmitFiles.clear();
!     }
  
    cmMakefile* mf = command->GetMakefile();