diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-04 20:25:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-05-04 20:58:03 (GMT) |
| commit | 3edf7fbb418d0da1e1ef1717b35b828d2003c427 (patch) | |
| tree | 707f2c8f71310caec7cc3e7c43f2c31791c7c574 /Source/CTest | |
| parent | 39a20a56ddcde1eecd44b32ab0610b579a7ac4eb (diff) | |
| download | CMake-3edf7fbb418d0da1e1ef1717b35b828d2003c427.zip CMake-3edf7fbb418d0da1e1ef1717b35b828d2003c427.tar.gz CMake-3edf7fbb418d0da1e1ef1717b35b828d2003c427.tar.bz2 | |
ctest: Fix TIMEOUT test property with value 0 with --timeout flag
An explicit zero TIMEOUT test property value should not be overridden by
the `--timeout` flag.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index bfc6bd6..cd92e0a 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1379,7 +1379,7 @@ bool cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed, p.Cost = static_cast<float>(rand()); } - if (p.Timeout == cmDuration::zero() && + if (p.Timeout == cmDuration::zero() && !p.ExplicitTimeout && this->CTest->GetGlobalTimeout() != cmDuration::zero()) { p.Timeout = this->CTest->GetGlobalTimeout(); } |