Mercurial > vim

changeset 9145:3583c3433870 v7.4.1856

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/324a78f3b649e7b14741519ecf19c4aba178772d Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 28 22:47:12 2016 +0200 patch 7.4.1856 Problem: failing job test fails on MS-Windows. Solution: Expect "fail" status instead of "dead".
author Christian Brabandt <cb@256bit.org>
date Sat, 28 May 2016 23:00:04 +0200
parents 0488f441e240
children 23a544d11064
files src/testdir/test_partial.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1856,
+/**/
     1855,
 /**/
     1854,