diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-05-28 22:47:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-05-28 22:47:12 +0200 |
| commit | 324a78f3b649e7b14741519ecf19c4aba178772d (patch) | |
| tree | 5b4a1e8ef0131886c6ec57598c443e969842b96d | |
| parent | 655da31a18ef3f888acf10e68b438e2a851f7b14 (diff) | |
patch 7.4.1856v7.4.1856
Problem: failing job test fails on MS-Windows.
Solution: Expect "fail" status instead of "dead".
| -rw-r--r-- | src/testdir/test_partial.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim index f33aab3a1a..9cbb7a3655 100644 --- 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 e68c4ec05f..e47ab53387 100644 --- 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, |