diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-15 18:35:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-15 18:35:51 (GMT) |
| commit | 2272d256fb811308102ad46f0992ebfc73094ddc (patch) | |
| tree | 8ff6be62dac4ed494c49c75daec100ac013a0b9f /Source | |
| parent | 204c0a65af7e4e00c9ab9525de5b02c143034f97 (diff) | |
| parent | d1976cd1f226a6da00dbab1b851202f0c69341db (diff) | |
| download | CMake-2272d256fb811308102ad46f0992ebfc73094ddc.zip CMake-2272d256fb811308102ad46f0992ebfc73094ddc.tar.gz CMake-2272d256fb811308102ad46f0992ebfc73094ddc.tar.bz2 | |
Merge topic 'ctest-timeout-on-pipe'
d1976cd1f2 CTest: Fix timeout when grandchild keeps pipes open
2f5eb1800b Tests: Add RunCMake.CTestTimeout test
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4217
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmProcess.cxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 2ec9622..cdf899c 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -278,9 +278,6 @@ void cmProcess::OnTimeoutCB(uv_timer_t* timer) void cmProcess::OnTimeout() { - if (this->ProcessState != cmProcess::State::Executing) { - return; - } this->ProcessState = cmProcess::State::Expired; bool const was_still_reading = !this->ReadHandleClosed; if (!this->ReadHandleClosed) { |