Merge topic 'only_change_timeout_once'
06b7f5d2 CTest: Only apply the secondary test timeout once
This commit is contained in:
commit
c69ed0a884
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user