IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix(pty_process_win/wait_eof_timer_cb): also check for proc->out.did_eof
This commit is contained in:
James McCoy 2022-03-02 11:57:19 -05:00 committed by GitHub
commit 482ea0cc17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ci/build.ps1
View File

@ -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
$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
# }
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

2
src/nvim/os/pty_process_win.c
View File

@ -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);
}