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

CMake global timeout (--timeout option) should prevail over individual test timeouts if it is lower than the individual timeout.

This commit is contained in:
Zach Mullen 2009-12-07 13:25:54 -05:00
parent 1e04804e84
commit b30f627190
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CTest/cmCTestTestHandler.cxx
View File

@ -1051,7 +1051,8 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
p.Cost = rand();
}
if(p.Timeout == 0 && this->CTest->GetGlobalTimeout() != 0)
if((p.Timeout == 0 || p.Timeout > this->CTest->GetGlobalTimeout())
&& this->CTest->GetGlobalTimeout() != 0)
{
p.Timeout = this->CTest->GetGlobalTimeout();
}