diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-12-08 15:26:43 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-12-08 15:26:43 (GMT) |
| commit | c32088cfee5f6b6957dffd47614809ef7e19be8d (patch) | |
| tree | 10aae0e2560051524505c95af0e4d27b63419d5e /Source/CTest/cmCTestTestHandler.cxx | |
| parent | 1d91bc64aa824c58ddcffeae4efb14d89a89c493 (diff) | |
| download | CMake-c32088cfee5f6b6957dffd47614809ef7e19be8d.zip CMake-c32088cfee5f6b6957dffd47614809ef7e19be8d.tar.gz CMake-c32088cfee5f6b6957dffd47614809ef7e19be8d.tar.bz2 | |
Local test timeouts will now always take precedence over the global --timeout option.
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 1718ac3..cbac272 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1051,8 +1051,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed, p.Cost = rand(); } - if((p.Timeout == 0 || p.Timeout > this->CTest->GetGlobalTimeout()) - && this->CTest->GetGlobalTimeout() != 0) + if(p.Timeout == 0 && this->CTest->GetGlobalTimeout() != 0) { p.Timeout = this->CTest->GetGlobalTimeout(); } |