diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-11-07 13:09:18 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-11-07 13:09:18 +0100 |
commit | 46f479c756c0255e3b6d473590c1857678eff5c6 (patch) | |
tree | 72ad2e9247a483494df04d94893733e40d43c5ca | |
parent | faebda8cc1ecc4d6a197e06e968df46a2841ed79 (diff) | |
download | vim-git-46f479c756c0255e3b6d473590c1857678eff5c6.tar.gz |
patch 8.2.1965: Vim9: tests fail without the channel featurev8.2.1965
Problem: Vim9: tests fail without the channel feature.
Solution: Check if the channel feature is present. (Dominique Pellé,
closes 7270)
-rw-r--r-- | src/testdir/test_vim9_expr.vim | 46 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 29 insertions, 19 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 2d741e495..83db71530 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1292,26 +1292,26 @@ func Test_expr5_fails() call CheckDefFailure(["var x = '1' ..'2'"], msg, 1) call CheckDefFailure(["var x = '1'.. '2'"], msg, 1) - call CheckDefFailure(["var x = 0z1122 + 33"], 'E1051', 1) - call CheckDefFailure(["var x = 0z1122 + [3]"], 'E1051', 1) - call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051', 1) - call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051', 1) - call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051', 1) - call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051', 1) - call CheckDefFailure(["var x = 6 + xxx"], 'E1001', 1) - - call CheckDefFailure(["var x = 'a' .. [1]"], 'E1105', 1) - call CheckDefFailure(["var x = 'a' .. #{a: 1}"], 'E1105', 1) - call CheckDefFailure(["var x = 'a' .. test_void()"], 'E1105', 1) - call CheckDefFailure(["var x = 'a' .. 0z32"], 'E1105', 1) - call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105', 1) - call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105', 1) + call CheckDefFailure(["var x = 0z1122 + 33"], 'E1051:', 1) + call CheckDefFailure(["var x = 0z1122 + [3]"], 'E1051:', 1) + call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051:', 1) + call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051:', 1) + call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051:', 1) + call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051:', 1) + call CheckDefFailure(["var x = 6 + xxx"], 'E1001:', 1) + + call CheckDefFailure(["var x = 'a' .. [1]"], 'E1105:', 1) + call CheckDefFailure(["var x = 'a' .. #{a: 1}"], 'E1105:', 1) + call CheckDefFailure(["var x = 'a' .. test_void()"], 'E1105:', 1) + call CheckDefFailure(["var x = 'a' .. 0z32"], 'E1105:', 1) + call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105:', 1) + call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105:', 1) endfunc func Test_expr5_fails_channel() CheckFeature channel - call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105', 1) - call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105', 1) + call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105:', 1) + call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105:', 1) endfunc " test multiply, divide, modulo @@ -1352,7 +1352,7 @@ def Test_expr6() * yf[0]) endif - CheckDefFailure(["var x = 6 * xxx"], 'E1001', 1) + CheckDefFailure(["var x = 6 * xxx"], 'E1001:', 1) enddef def Test_expr6_vim9script() @@ -1757,7 +1757,11 @@ def Test_expr7_list_vim9script() enddef var list = [Failing] END - CheckScriptFailure(lines, 'E119:', 1) + if has('channel') + CheckScriptFailure(lines, 'E119:', 1) + else + CheckScriptFailure(lines, 'E117:', 1) + endif enddef def LambdaWithComments(): func @@ -2028,7 +2032,11 @@ def Test_expr7_dict_vim9script() enddef var dict = #{name: Failing} END - CheckScriptFailure(lines, 'E119:', 1) + if has('channel') + CheckScriptFailure(lines, 'E119:', 1) + else + CheckScriptFailure(lines, 'E117:', 1) + endif enddef let g:oneString = 'one' diff --git a/src/version.c b/src/version.c index 19f5ba296..786e05ea7 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1965, +/**/ 1964, /**/ 1963, |