diff options
| author | Zack Galbreath <zack.galbreath@kitware.com> | 2016-03-23 16:09:41 (GMT) |
|---|---|---|
| committer | Zack Galbreath <zack.galbreath@kitware.com> | 2016-03-23 16:09:41 (GMT) |
| commit | 06b7f5d2cac5e697b503337e870e34b11a592bd1 (patch) | |
| tree | ee6bbdc52210e5fe9dd500d468728bf03e8feb48 | |
| parent | d196585bcb33c9b19410e87d92dcd0c7dc697d5e (diff) | |
| download | CMake-06b7f5d2cac5e697b503337e870e34b11a592bd1.zip CMake-06b7f5d2cac5e697b503337e870e34b11a592bd1.tar.gz CMake-06b7f5d2cac5e697b503337e870e34b11a592bd1.tar.bz2 | |
CTest: Only apply the secondary test timeout once
This commit fixes a bug in the implementation of the test property
TIMEOUT_AFTER_MATCH. The new timeout value was being applied
every time a line was output by the test after the match had been
encountered. Now the new timeout value is only set once.
This commit also improves some output formatting related to this
property.
| -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; } } |