# HG changeset patch # User Christian Brabandt # Date 1464469204 -7200 # Node ID 3583c3433870e0c7e5814532c21de4c21e6a6ce6 # Parent 0488f441e240f0d5ce6c12d8ba77bc02c711e5eb commit https://github.com/vim/vim/commit/324a78f3b649e7b14741519ecf19c4aba178772d Author: Bram Moolenaar 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". diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim --- 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 --- 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,