patch 8.2.0362: MS-Windows: channel test fails if grep is not available

Problem:    MS-Windows: channel test fails if grep is not available.
Solution:   Use another command. (Ken Takata, closes #5739)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index c98f5bd683cbeea45ed3393ad3207057079e8a06..e1f8a5e352e42f84ee5ec4a06c1cfd27fe083973 100644 (file)
--- 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 2c4cd0db3974f3311cc8a08e3f05c5b784e2b7d3..1d81c63cc7ec2b36b80610eef00a2d48350f456d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    362,
 /**/
     361,
 /**/