diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2017-04-21 13:31:36 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2017-04-21 17:03:00 (GMT) |
| commit | 5969048d1dbd531902f187699e47754115274564 (patch) | |
| tree | 2f3a83d379d2a8aa616e197a7bce6a45f062e253 | |
| parent | 1d8f0f918178c50e8ef66b01546f34cd2a126a6d (diff) | |
| download | CMake-5969048d1dbd531902f187699e47754115274564.zip CMake-5969048d1dbd531902f187699e47754115274564.tar.gz CMake-5969048d1dbd531902f187699e47754115274564.tar.bz2 | |
cmCTestTestCommand: defer getting the global timeout
| -rw-r--r-- | Source/CTest/cmCTestTestCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx index a756188..21b1003 100644 --- a/Source/CTest/cmCTestTestCommand.cxx +++ b/Source/CTest/cmCTestTestCommand.cxx @@ -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; |