diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-11-30 21:08:11 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-11-30 21:08:11 (GMT) |
| commit | a52c0118d454ea9ec93a05be8be552d587467813 (patch) | |
| tree | ad6db52bca2066c2fbd9ad553a53a646cbe82cc5 /Source/CTest/cmCTestTestHandler.cxx | |
| parent | b21f1eaeae274589945c4e2e3e77a7b39305ac0d (diff) | |
| download | CMake-a52c0118d454ea9ec93a05be8be552d587467813.zip CMake-a52c0118d454ea9ec93a05be8be552d587467813.tar.gz CMake-a52c0118d454ea9ec93a05be8be552d587467813.tar.bz2 | |
Added the --timeout option to ctest command line. This sets a global timeout on all tests if no more specific timeout is set on them.
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index f6dede8..4437c56 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1052,6 +1052,11 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed, p.Cost = rand(); } + if(p.Timeout == 0 && this->CTest->GetGlobalTimeout() != 0) + { + p.Timeout = this->CTest->GetGlobalTimeout(); + } + if(p.Depends.size()) { for(std::vector<std::string>::iterator i = p.Depends.begin(); |