summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-08 17:25:19 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-08 17:25:19 +0200
commit9e4043757cd2fc18d071fdd98abf297d74878943 (patch)
treee05d93326c692e8f9ff90514ad0574330a82a53e /src
parent107e1eef1df3b786ad3ad49fbdb9e058649303b5 (diff)
patch 7.4.1720v7.4.1720
Problem: Tests fail without the job feature. Solution: Skip tests when the job feature is not present.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_partial.vim16
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 6 deletions
diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim
index 404bb748db..5f4a48faf8 100644
--- a/src/testdir/test_partial.vim
+++ b/src/testdir/test_partial.vim
@@ -243,13 +243,17 @@ func Ignored(job1, job2, status)
endfunc
func Test_cycle_partial_job()
- let job = job_start('echo')
- call job_setoptions(job, {'exit_cb': function('Ignored', [job])})
- unlet job
+ if has('job')
+ let job = job_start('echo')
+ call job_setoptions(job, {'exit_cb': function('Ignored', [job])})
+ unlet job
+ endif
endfunc
func Test_ref_job_partial_dict()
- let g:ref_job = job_start('echo')
- let d = {'a': 'b'}
- call job_setoptions(g:ref_job, {'exit_cb': function('string', [], d)})
+ if has('job')
+ let g:ref_job = job_start('echo')
+ let d = {'a': 'b'}
+ call job_setoptions(g:ref_job, {'exit_cb': function('string', [], d)})
+ endif
endfunc
diff --git a/src/version.c b/src/version.c
index dd50f983d9..dc51874dc1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1720,
+/**/
1719,
/**/
1718,