diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-28 13:25:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-28 13:25:40 (GMT) |
| commit | c69ed0a8844ea5f417fefa758cdbcfc978d89712 (patch) | |
| tree | 86f8ba19a157d58587c8b7e6cedc878006d70625 | |
| parent | aa9227aa4d2ff415abd7c9a24ff0cc21d9721640 (diff) | |
| parent | 06b7f5d2cac5e697b503337e870e34b11a592bd1 (diff) | |
| download | CMake-c69ed0a8844ea5f417fefa758cdbcfc978d89712.zip CMake-c69ed0a8844ea5f417fefa758cdbcfc978d89712.tar.gz CMake-c69ed0a8844ea5f417fefa758cdbcfc978d89712.tar.bz2 | |
Merge topic 'only_change_timeout_once'
06b7f5d2 CTest: Only apply the secondary test timeout once
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 7f3a077..f329e77 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -77,11 +77,13 @@ bool cmCTestRunTest::CheckOutput() if ( regIt->first.find(this->ProcessOutput.c_str()) ) { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, + this->GetIndex() << ": " << "Test timeout changed to " << this->TestProperties->AlternateTimeout << std::endl); this->TestProcess->ResetStartTime(); this->TestProcess->ChangeTimeout( this->TestProperties->AlternateTimeout); + this->TestProperties->TimeoutRegularExpressions.clear(); break; } } |