diff options
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 4 | ||||
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 4 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 46d9f26..8a2d65a 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -251,7 +251,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) tarIt != this->BuildTargets.end(); ++ tarIt ) { double remainingTime = 0; - if (this->Timeout) + if (this->Timeout > 0) { remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start; if (remainingTime <= 0) @@ -376,7 +376,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) // how much time is remaining double remainingTime = 0; - if (this->Timeout) + if (this->Timeout > 0) { remainingTime = this->Timeout - cmSystemTools::GetTime() + clock_start; if (remainingTime <= 0) diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 982beb3..6d5943d 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -419,11 +419,11 @@ bool cmCTestRunTest::CreateProcess(double testTimeOut, // determine how much time we have double timeout = this->CTest->GetRemainingTimeAllowed() - 120; - if (this->CTest->GetTimeOut() && this->CTest->GetTimeOut() < timeout) + if (this->CTest->GetTimeOut() > 0 && this->CTest->GetTimeOut() < timeout) { timeout = this->CTest->GetTimeOut(); } - if (testTimeOut + if (testTimeOut > 0 && testTimeOut < this->CTest->GetRemainingTimeAllowed()) { timeout = testTimeOut; diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index be08be1..8dace33 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1082,11 +1082,11 @@ int cmCTest::RunTest(std::vector<const char*> argv, // determine how much time we have double timeout = this->GetRemainingTimeAllowed() - 120; - if (this->TimeOut && this->TimeOut < timeout) + if (this->TimeOut > 0 && this->TimeOut < timeout) { timeout = this->TimeOut; } - if (testTimeOut + if (testTimeOut > 0 && testTimeOut < this->GetRemainingTimeAllowed()) { timeout = testTimeOut; @@ -1118,7 +1118,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, // make sure we pass the timeout in for any build and test // invocations. Since --build-generator is required this is a // good place to check for it, and to add the arguments in - if (strcmp(argv[i],"--build-generator") == 0 && timeout) + if (strcmp(argv[i],"--build-generator") == 0 && timeout > 0) { args.push_back("--test-timeout"); cmOStringStream msg; |