kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Zack Galbreath 2016-03-23 12:09:41 -04:00
parent d196585bcb
commit 06b7f5d2ca
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestRunTest.cxx
View File

@ -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;
}
}