diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-07 17:24:59 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-07 17:24:59 +0100 |
| commit | d0d440f702d1c6fef36386f8b91d074d0f3e4718 (patch) | |
| tree | 5cd910694e36b8f245a0b6bccdae289552cc5bac | |
| parent | 14e57909e662a43a42438e2701654af48af49b03 (diff) | |
| download | vim-git-d0d440f702d1c6fef36386f8b91d074d0f3e4718.tar.gz | |
patch 8.2.0362: MS-Windows: channel test fails if grep is not availablev8.2.0362
Problem: MS-Windows: channel test fails if grep is not available.
Solution: Use another command. (Ken Takata, closes #5739)
| -rw-r--r-- | src/testdir/test_channel.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index c98f5bd68..e1f8a5e35 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1992,15 +1992,20 @@ func Test_job_start_fails() endfunc func Test_issue_5150() - let g:job = job_start('grep foo', {}) + if has('win32') + let cmd = 'cmd /c pause' + else + let cmd = 'grep foo' + endif + let g:job = job_start(cmd, {}) call job_stop(g:job) sleep 10m call assert_equal(-1, job_info(g:job).exitval) - let g:job = job_start('grep foo', {}) + let g:job = job_start(cmd, {}) call job_stop(g:job, 'term') sleep 10m call assert_equal(-1, job_info(g:job).exitval) - let g:job = job_start('grep foo', {}) + let g:job = job_start(cmd, {}) call job_stop(g:job, 'kill') sleep 10m call assert_equal(-1, job_info(g:job).exitval) diff --git a/src/version.c b/src/version.c index 2c4cd0db3..1d81c63cc 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 362, +/**/ 361, /**/ 360, |