diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-05-06 13:37:42 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-05-06 13:37:42 +0100 |
commit | f1d63b9cba9ca91d6367615c6098761c30c6cb5b (patch) | |
tree | 9faaace867fa9af24b03d1849f7e1060fc6b79d7 | |
parent | 175913fb03ba33171bdfcb03db51d32a39e3e7a8 (diff) |
patch 8.2.4885: test fails with the job/channel featurev8.2.4885
Problem: Test fails with the job/channel feature.
Solution: Move check for job/channel separately.
-rw-r--r-- | src/testdir/test_vim9_script.vim | 26 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 8ad3b303ec..c5c3eb989d 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -4199,10 +4199,6 @@ def Test_echo_uninit_variables() var Var_func: func var var_string: string var var_blob: blob - if has('job') - var var_job: job - var var_channel: channel - endif var var_list: list<any> var var_dict: dict<any> @@ -4213,19 +4209,23 @@ def Test_echo_uninit_variables() echo Var_func echo var_string echo var_blob - if has('job') - echo var_job - echo var_channel - else - echo 'no process' - echo 'channel fail' - endif echo var_list echo var_dict redir END - assert_equal(['false', '0', '0.0', 'function()', '', '0z', 'no process', - 'channel fail', '[]', '{}'], res->split('\n')) + assert_equal(['false', '0', '0.0', 'function()', '', '0z', '[]', '{}'], res->split('\n')) + + if has('job') + var var_job: job + var var_channel: channel + + redir => res + echo var_job + echo var_channel + redir END + + assert_equal(['no process', 'channel fail'], res->split('\n')) + endif enddef " Keep this last, it messes up highlighting. diff --git a/src/version.c b/src/version.c index 77aab2fcb8..24219311fb 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4885, +/**/ 4884, /**/ 4883, |