Merge pull request #17575 from zeertzjq/pty-did-eof

fix(pty_process_win/wait_eof_timer_cb): also check for proc->out.did_eof

2 files changed, 9 insertions, 13 deletions

diff --git a/ci/build.ps1 b/ci/build.ps1
index 01579a96fe..c7c3b3d470 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -164,21 +164,17 @@ if (-not $NoTests) {
     exit $LastExitCode
   }
 
-  # FIXME: These tests freezes on github CI and causes all jobs to fail.
-  # Comment out until this is fixed.
-  
   # Old tests
   # Add MSYS to path, required for e.g. `find` used in test scripts.
   # But would break functionaltests, where its `more` would be used then.
-  
-  # $OldPath = $env:PATH
-  # $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-  # & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 ; exitIfFailed
-  # $env:PATH = $OldPath
-
-  # if ($uploadToCodecov) {
-  #   bash -l /c/projects/neovim/ci/common/submit_coverage.sh oldtest
-  # }
+  $OldPath = $env:PATH
+  $env:PATH = "C:\msys64\usr\bin;$env:PATH"
+  & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 ; exitIfFailed
+  $env:PATH = $OldPath
+
+  if ($uploadToCodecov) {
+    bash -l /c/projects/neovim/ci/common/submit_coverage.sh oldtest
+  }
 }
 
 # Ensure choco's cpack is not in PATH otherwise, it conflicts with CMake's
diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c
index f78f3e66f5..99231968a2 100644
--- a/src/nvim/os/pty_process_win.c
+++ b/src/nvim/os/pty_process_win.c
@@ -281,7 +281,7 @@ static void wait_eof_timer_cb(uv_timer_t *wait_eof_timer)
   PtyProcess *ptyproc = wait_eof_timer->data;
   Process *proc = (Process *)ptyproc;
 
-  if (proc->out.closed || !uv_is_readable(proc->out.uvstream)) {
+  if (proc->out.closed || proc->out.did_eof || !uv_is_readable(proc->out.uvstream)) {
     uv_timer_stop(&ptyproc->wait_eof_timer);
     pty_process_finish2(ptyproc);
   }