diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-12-07 18:25:54 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-12-07 18:25:54 (GMT) |
| commit | b30f627190fce88d8c08dc4686abccc6c7df6f3d (patch) | |
| tree | 0941e7dd7dba52eea08ee3e24b5373a5ac245088 /Source/CTest | |
| parent | 1e04804e84fb55593fca585f3bb137f4766af969 (diff) | |
| download | CMake-b30f627190fce88d8c08dc4686abccc6c7df6f3d.zip CMake-b30f627190fce88d8c08dc4686abccc6c7df6f3d.tar.gz CMake-b30f627190fce88d8c08dc4686abccc6c7df6f3d.tar.bz2 | |
CMake global timeout (--timeout option) should prevail over individual test timeouts if it is lower than the individual timeout.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index cbac272..1718ac3 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -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(); } |