mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 02:38:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ctest-timeout-on-pipe'

Browse Source 
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
This commit is contained in:
Brad King
2020-01-15 18:35:44 +00:00
committed by Kitware Robot
parent 204c0a65af d1976cd1f2
commit 2272d256fb
8 changed files with 90 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CTest/cmProcess.cxx
View File

@@ -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) {