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

Merge topic 'only_change_timeout_once'

Browse Source 
06b7f5d2 CTest: Only apply the secondary test timeout once
This commit is contained in:
Brad King 2016-03-28 09:25:40 -04:00 committed by CMake Topic Stage
commit c69ed0a884
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()) ) if ( regIt->first.find(this->ProcessOutput.c_str()) )
{ {
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
this->GetIndex() << ": " <<
"Test timeout changed to " << "Test timeout changed to " <<
this->TestProperties->AlternateTimeout << std::endl); this->TestProperties->AlternateTimeout << std::endl);
this->TestProcess->ResetStartTime(); this->TestProcess->ResetStartTime();
this->TestProcess->ChangeTimeout( this->TestProcess->ChangeTimeout(
this->TestProperties->AlternateTimeout); this->TestProperties->AlternateTimeout);
this->TestProperties->TimeoutRegularExpressions.clear();
break; break;
} }
} }