[Cmake-commits] [cmake-commits] king committed cmCTestMultiProcessHandler.cxx 1.21 1.22 cmCTestRunTest.cxx 1.17 1.18 cmCTestRunTest.h 1.9 1.10

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestMultiProcessHandler.cxx cmCTestRunTest.cxx 
	cmCTestRunTest.h 
Log Message:
Initialize cmCTestRunTest instances robustly

All instances of this class need a cmCTestTestHandler, so we now require
one to construct it.  The instance also provides the cmCTest instance
too.


Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** cmCTestMultiProcessHandler.cxx	10 Sep 2009 15:16:07 -0000	1.21
--- cmCTestMultiProcessHandler.cxx	11 Sep 2009 14:09:41 -0000	1.22
***************
*** 84,90 ****
    this->EraseTest(test);
  
!   cmCTestRunTest* testRun = new cmCTestRunTest;
!   testRun->SetCTest(this->CTest);
!   testRun->SetTestHandler(this->TestHandler);
    testRun->SetIndex(test);
    testRun->SetTestProperties(this->Properties[test]);
--- 84,88 ----
    this->EraseTest(test);
  
!   cmCTestRunTest* testRun = new cmCTestRunTest(this->TestHandler);
    testRun->SetIndex(test);
    testRun->SetTestProperties(this->Properties[test]);
***************
*** 347,353 ****
      cmCTestTestHandler::cmCTestTestProperties& p = *it->second;
  
!     cmCTestRunTest testRun;
!     testRun.SetCTest(this->CTest);
!     testRun.SetTestHandler(this->TestHandler);
      testRun.SetIndex(p.Index);
      testRun.SetTestProperties(&p);
--- 345,349 ----
      cmCTestTestHandler::cmCTestTestProperties& p = *it->second;
  
!     cmCTestRunTest testRun(this->TestHandler);
      testRun.SetIndex(p.Index);
      testRun.SetTestProperties(&p);

Index: cmCTestRunTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** cmCTestRunTest.h	8 Sep 2009 13:12:44 -0000	1.9
--- cmCTestRunTest.h	11 Sep 2009 14:09:48 -0000	1.10
***************
*** 30,34 ****
  {
  public:
!   cmCTestRunTest();
    ~cmCTestRunTest();
  
--- 30,34 ----
  {
  public:
!   cmCTestRunTest(cmCTestTestHandler* handler);
    ~cmCTestRunTest();
  
***************
*** 38,48 ****
    cmCTestTestHandler::cmCTestTestProperties * GetTestProperties()
    { return this->TestProperties; }
-   
-   void SetTestHandler(cmCTestTestHandler * handler);
  
    void SetIndex(int i) { this->Index = i; }
  
-   void SetCTest(cmCTest * ct) { this->CTest = ct; }
- 
    int GetIndex() { return this->Index; }
  
--- 38,44 ----

Index: cmCTestRunTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunTest.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** cmCTestRunTest.cxx	10 Sep 2009 15:16:08 -0000	1.17
--- cmCTestRunTest.cxx	11 Sep 2009 14:09:46 -0000	1.18
***************
*** 21,26 ****
  #include "cmSystemTools.h"
  
! cmCTestRunTest::cmCTestRunTest()
  {
  }
  
--- 21,28 ----
  #include "cmSystemTools.h"
  
! cmCTestRunTest::cmCTestRunTest(cmCTestTestHandler* handler)
  {
+   this->CTest = handler->CTest;
+   this->TestHandler = handler;
  }
  
***************
*** 303,312 ****
  }
  
- void cmCTestRunTest::SetTestHandler(cmCTestTestHandler * handler)
- {
-   this->TestHandler = handler;
-   this->CTest = handler->CTest;
- }
- 
  //----------------------------------------------------------------------
  // Starts the execution of a test.  Returns once it has started
--- 305,308 ----