Browse Source

cmCTest: Remove unused member LastStopTimeout

This member was added by commit v2.8.2~285 (Better detection of
stop_time being passed, 2010-03-19), but its logic has no effect.
The member is only used for comparison against a value to which
it was just assigned.
Brad King 7 years ago
parent
commit
1138feb38f
3 changed files with 1 additions and 6 deletions
  1. 1 3
      Source/CTest/cmCTestRunTest.cxx
  2. 0 1
      Source/cmCTest.cxx
  3. 0 2
      Source/cmCTest.h

+ 1 - 3
Source/CTest/cmCTestRunTest.cxx

@@ -649,10 +649,8 @@ std::chrono::duration<double> cmCTestRunTest::ResolveTimeout()
   auto stop_timeout =
   auto stop_timeout =
     (stop_time - std::chrono::system_clock::from_time_t(current_time)) %
     (stop_time - std::chrono::system_clock::from_time_t(current_time)) %
     std::chrono::hours(24);
     std::chrono::hours(24);
-  this->CTest->LastStopTimeout = stop_timeout;
 
 
-  if (stop_timeout <= std::chrono::duration<double>::zero() ||
-      stop_timeout > this->CTest->LastStopTimeout) {
+  if (stop_timeout <= std::chrono::duration<double>::zero()) {
     cmCTestLog(this->CTest, ERROR_MESSAGE, "The stop time has been passed. "
     cmCTestLog(this->CTest, ERROR_MESSAGE, "The stop time has been passed. "
                                            "Stopping all tests."
                                            "Stopping all tests."
                  << std::endl);
                  << std::endl);

+ 0 - 1
Source/cmCTest.cxx

@@ -279,7 +279,6 @@ cmCTest::cmCTest()
   this->InteractiveDebugMode = true;
   this->InteractiveDebugMode = true;
   this->TimeOut = std::chrono::duration<double>::zero();
   this->TimeOut = std::chrono::duration<double>::zero();
   this->GlobalTimeout = std::chrono::duration<double>::zero();
   this->GlobalTimeout = std::chrono::duration<double>::zero();
-  this->LastStopTimeout = std::chrono::hours(24);
   this->CompressXMLFiles = false;
   this->CompressXMLFiles = false;
   this->ScheduleType.clear();
   this->ScheduleType.clear();
   this->StopTime.clear();
   this->StopTime.clear();

+ 0 - 2
Source/cmCTest.h

@@ -512,8 +512,6 @@ private:
 
 
   std::chrono::duration<double> GlobalTimeout;
   std::chrono::duration<double> GlobalTimeout;
 
 
-  std::chrono::duration<double> LastStopTimeout;
-
   int MaxTestNameWidth;
   int MaxTestNameWidth;
 
 
   int ParallelLevel;
   int ParallelLevel;