[Cmake-commits] [cmake-commits] king committed cmCTest.cxx 1.348 1.349 cmCTest.h 1.109 1.110

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx cmCTest.h 
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: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -C 2 -d -r1.109 -r1.110
*** cmCTest.h	12 Jan 2009 15:37:25 -0000	1.109
--- cmCTest.h	12 Jan 2009 15:37:55 -0000	1.110
***************
*** 63,66 ****
--- 63,67 ----
      PartSubmit,
      PartNotes,
+     PartExtraFiles,
      PartCount // Update names in constructor when adding a part
    };
***************
*** 76,79 ****
--- 77,82 ----
      void Enable() { this->Enabled = true; }
      operator bool() const { return this->Enabled; }
+ 
+     std::vector<std::string> SubmitFiles;
    private:
      bool Enabled;
***************
*** 148,152 ****
     */
    bool CTestFileExists(const std::string& filename);
!   bool AddIfExists(SetOfStrings& files, const char* file);
  
    /**
--- 151,155 ----
     */
    bool CTestFileExists(const std::string& filename);
!   bool AddIfExists(Part part, const char* file);
  
    /**
***************
*** 353,358 ****
  
    //! Add file to be submitted
!   void AddSubmitFile(const char* name);
!   SetOfStrings* GetSubmitFiles() { return &this->SubmitFiles; }
  
    //! Read the custom configuration files and apply them to the current ctest
--- 356,362 ----
  
    //! Add file to be submitted
!   void AddSubmitFile(Part part, const char* name);
!   std::vector<std::string> const& GetSubmitFiles(Part part)
!     { return this->Parts[part].SubmitFiles; }
  
    //! Read the custom configuration files and apply them to the current ctest

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.348
retrieving revision 1.349
diff -C 2 -d -r1.348 -r1.349
*** cmCTest.cxx	12 Jan 2009 15:37:25 -0000	1.348
--- cmCTest.cxx	12 Jan 2009 15:37:55 -0000	1.349
***************
*** 270,273 ****
--- 270,274 ----
    this->Parts[PartSubmit].SetName("Submit");
    this->Parts[PartNotes].SetName("Notes");
+   this->Parts[PartExtraFiles].SetName("ExtraFiles");
  
    // Fill the part name-to-id map.
***************
*** 735,743 ****
  
  //----------------------------------------------------------------------
! bool cmCTest::AddIfExists(SetOfStrings& files, const char* file)
  {
    if ( this->CTestFileExists(file) )
      {
!     files.insert(file);
      }
    else
--- 736,744 ----
  
  //----------------------------------------------------------------------
! bool cmCTest::AddIfExists(Part part, const char* file)
  {
    if ( this->CTestFileExists(file) )
      {
!     this->AddSubmitFile(part, file);
      }
    else
***************
*** 747,751 ****
      if ( this->CTestFileExists(name.c_str()) )
        {
!       files.insert(name.c_str());
        }
      else
--- 748,752 ----
      if ( this->CTestFileExists(name.c_str()) )
        {
!       this->AddSubmitFile(part, file);
        }
      else
***************
*** 1449,1453 ****
        return false;
        }
!     this->AddSubmitFile(it->c_str());
      }
    return true;
--- 1450,1454 ----
        return false;
        }
!     this->AddSubmitFile(PartExtraFiles, it->c_str());
      }
    return true;
***************
*** 2437,2443 ****
  
  //----------------------------------------------------------------------
! void cmCTest::AddSubmitFile(const char* name)
  {
!   this->SubmitFiles.insert(name);
  }
  
--- 2438,2444 ----
  
  //----------------------------------------------------------------------
! void cmCTest::AddSubmitFile(Part part, const char* name)
  {
!   this->Parts[part].SubmitFiles.push_back(name);
  }