mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-29 04:09:35 +03:00
Code Activity

cmCTestTestCommand: defer getting the global timeout

Browse Source
This commit is contained in:
Ben Boeckel
2017-04-21 13:03:00 -04:00
parent 1d8f0f9181
commit 5969048d1d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmCTestTestCommand.cxx
+2 -1
View File
@@ -33,10 +33,11 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
const char* ctestTimeout =
this->Makefile->GetDefinition("CTEST_TEST_TIMEOUT");
double timeout = this->CTest->GetTimeOut();
double timeout;
if (ctestTimeout) {
timeout = atof(ctestTimeout);
} else {
timeout = this->CTest->GetTimeOut();
if (timeout <= 0) {
// By default use timeout of 10 minutes
timeout = 600;