patch 7.4.1856

Problem:    failing job test fails on MS-Windows.
Solution:   Expect "fail" status instead of "dead".

diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim
index f33aab3a1aada13c569eb8d97a38a3d5d3fba64e..9cbb7a36550613d14034248fb4a9b3020bfad70a 100644 (file)
--- a/src/testdir/test_partial.vim
+++ b/src/testdir/test_partial.vim
@@ -254,12 +254,17 @@ func Test_job_start_fails()
   if has('job')
     let job = job_start('axdfxsdf')
     for i in range(100)
-      if job_status(job) == 'dead'
+      let status = job_status(job)
+      if status == 'dead' || status == 'fail'
        break
       endif
       sleep 10m
     endfor
-    call assert_equal('dead', job_status(job))
+    if has('unix')
+      call assert_equal('dead', job_status(job))
+    else
+      call assert_equal('fail', job_status(job))
+    endif
     unlet job
   endif
 endfunc

diff --git a/src/version.c b/src/version.c
index e68c4ec05f502803bceab4c94b8bf67ccfe75a92..e47ab53387f16997cd2c80002b84ce87274a1ae6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1856,
 /**/
     1855,
 /**/