diff options
| author | Brad King <brad.king@kitware.com> | 2023-10-02 12:57:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-10-02 12:57:36 (GMT) |
| commit | 37c80628ba1e4b713336f022fab80779d8334976 (patch) | |
| tree | de5fd7fa140db4292833d1f55b4047a1c4456785 /Source | |
| parent | 393d94094e645d2f64395f107d3425c1af909ef3 (diff) | |
| parent | d267c128a232e9beb99576f901ee1b9291ba1480 (diff) | |
| download | CMake-37c80628ba1e4b713336f022fab80779d8334976.zip CMake-37c80628ba1e4b713336f022fab80779d8334976.tar.gz CMake-37c80628ba1e4b713336f022fab80779d8334976.tar.bz2 | |
Merge topic 'ctest-timeout-flag'
d267c128a2 ctest: Restore support for --timeout values higher than default test timeout
dd779a4bc2 Tests: Clarify RunCMake.CTestTimeout case name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8851
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestRunTest.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 4c57cf6..8ceb9db 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -791,11 +791,12 @@ bool cmCTestRunTest::ForkProcess() timeout = this->CTest->GetGlobalTimeout(); } - // Check CTEST_TEST_TIMEOUT. - cmDuration ctestTestTimeout = this->CTest->GetTimeOut(); - if (ctestTestTimeout > cmDuration::zero() && - (!timeout || ctestTestTimeout < *timeout)) { - timeout = ctestTestTimeout; + if (!timeout) { + // Check CTEST_TEST_TIMEOUT. + cmDuration ctestTestTimeout = this->CTest->GetTimeOut(); + if (ctestTestTimeout > cmDuration::zero()) { + timeout = ctestTestTimeout; + } } } |