[Cmake-commits] [cmake-commits] king committed cmCTest.cxx 1.377 1.378 cmCTest.h 1.123 1.124

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx cmCTest.h 
Log Message:
CTest: Simplify Initialize method signature

We make the cmCTest::Initialize method private since it is only called
from inside the class implementation.  We also combine the two boolean
arguments into one since they both meant the same thing.


Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -C 2 -d -r1.123 -r1.124
*** cmCTest.h	29 Oct 2009 19:30:12 -0000	1.123
--- cmCTest.h	24 Nov 2009 13:58:48 -0000	1.124
***************
*** 94,99 ****
     * Initialize and finalize testing
     */
-   int Initialize(const char* binary_dir, bool new_tag = false,
-     bool verbose_tag = true);
    bool InitializeFromCommand(cmCTestCommand* command, bool first = false);
    void Finalize();
--- 94,97 ----
***************
*** 447,450 ****
--- 445,457 ----
    void BlockTestErrorDiagnostics();
  
+   /**
+    * Initialize a dashboard run in the given build tree.  The "script"
+    * argument is true when running from a command-driven (ctest_start)
+    * dashboard script, and false when running from the CTest command
+    * line.  Note that a declarative dashboard script does not actually
+    * call this method because it sets CTEST_COMMAND to drive a build
+    * through the ctest command line.
+    */
+   int Initialize(const char* binary_dir, bool script);
  
    //! parse the option after -D and convert it into the appropriate steps

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.377
retrieving revision 1.378
diff -C 2 -d -r1.377 -r1.378
*** cmCTest.cxx	29 Oct 2009 19:30:12 -0000	1.377
--- cmCTest.cxx	24 Nov 2009 13:58:46 -0000	1.378
***************
*** 312,317 ****
  
  //----------------------------------------------------------------------
! int cmCTest::Initialize(const char* binary_dir, bool new_tag,
!   bool verbose_tag)
  {
    cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
--- 312,316 ----
  
  //----------------------------------------------------------------------
! int cmCTest::Initialize(const char* binary_dir, bool script)
  {
    cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
***************
*** 417,421 ****
        tfin.close();
        }
!     if (tag.size() == 0 || new_tag || this->Parts[PartStart])
        {
        cmCTestLog(this, DEBUG, "TestModel: " << this->GetTestModelString()
--- 416,420 ----
        tfin.close();
        }
!     if (tag.size() == 0 || script || this->Parts[PartStart])
        {
        cmCTestLog(this, DEBUG, "TestModel: " << this->GetTestModelString()
***************
*** 442,446 ****
          }
        ofs.close();
!       if ( verbose_tag )
          {
          cmCTestLog(this, OUTPUT, "Create new tag: " << tag << " - "
--- 441,445 ----
          }
        ofs.close();
!       if ( !script )
          {
          cmCTestLog(this, OUTPUT, "Create new tag: " << tag << " - "
***************
*** 518,522 ****
      }
  
!   if ( !this->Initialize(bld_dir.c_str(), true, false) )
      {
      if ( this->GetCTestConfiguration("NightlyStartTime").empty() && first)
--- 517,521 ----
      }
  
!   if ( !this->Initialize(bld_dir.c_str(), true) )
      {
      if ( this->GetCTestConfiguration("NightlyStartTime").empty() && first)
***************
*** 2114,2119 ****
          it->second->SetSubmitIndex(this->SubmitIndex);
          }
!       if ( !this->Initialize(
!           cmSystemTools::GetCurrentWorkingDirectory().c_str()) )
          {
          res = 12;
--- 2113,2118 ----
          it->second->SetSubmitIndex(this->SubmitIndex);
          }
!       std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
!       if(!this->Initialize(cwd.c_str(), false))
          {
          res = 12;