From 1138feb38f4e6d259ded23312b7f0f2184ac816a Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 15 Dec 2017 07:20:54 -0500 Subject: 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. --- Source/CTest/cmCTestRunTest.cxx | 4 +--- Source/cmCTest.cxx | 1 - Source/cmCTest.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index dbdefae..0a27138 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -649,10 +649,8 @@ std::chrono::duration cmCTestRunTest::ResolveTimeout() auto stop_timeout = (stop_time - std::chrono::system_clock::from_time_t(current_time)) % std::chrono::hours(24); - this->CTest->LastStopTimeout = stop_timeout; - if (stop_timeout <= std::chrono::duration::zero() || - stop_timeout > this->CTest->LastStopTimeout) { + if (stop_timeout <= std::chrono::duration::zero()) { cmCTestLog(this->CTest, ERROR_MESSAGE, "The stop time has been passed. " "Stopping all tests." << std::endl); diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 26e1dcb..339bf5a 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -279,7 +279,6 @@ cmCTest::cmCTest() this->InteractiveDebugMode = true; this->TimeOut = std::chrono::duration::zero(); this->GlobalTimeout = std::chrono::duration::zero(); - this->LastStopTimeout = std::chrono::hours(24); this->CompressXMLFiles = false; this->ScheduleType.clear(); this->StopTime.clear(); diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 23d71cb..e1cf25e 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -512,8 +512,6 @@ private: std::chrono::duration GlobalTimeout; - std::chrono::duration LastStopTimeout; - int MaxTestNameWidth; int ParallelLevel; -- cgit v0.12