diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-04-05 13:36:34 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-04-05 13:36:34 +0200 |
commit | 886e5e737d0b2eea755c415a86997ca3b7fe5349 (patch) | |
tree | 890919688ccca3dc841cd692178dd60b1712f173 | |
parent | 409da842db9dc24d88e415e518c02c05ac7de760 (diff) | |
download | vim-git-886e5e737d0b2eea755c415a86997ca3b7fe5349.tar.gz |
patch 8.2.2715: Vim9: tests fail without the channel featurev8.2.2715
Problem: Vim9: tests fail without the channel feature. (Dominique Pellé)
Solution: Check for the channel feature. (closes #8063)
-rw-r--r-- | src/testdir/test_vim9_builtin.vim | 3 | ||||
-rw-r--r-- | src/testdir/test_vim9_expr.vim | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 8f112174e..f537eef82 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -209,6 +209,9 @@ def Test_call_call() enddef def Test_ch_logfile() + if !has('channel') + CheckFeature channel + endif assert_fails('ch_logfile(true)', 'E1174') assert_fails('ch_logfile("foo", true)', 'E1174') enddef diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index f5a0cd560..6bee982ea 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -2340,7 +2340,7 @@ def Test_expr7_dict_vim9script() if has('channel') CheckDefAndScriptFailure(lines, 'E119:', 0) else - CheckDefAndScriptFailure(lines, 'E117:', 1) + CheckDefAndScriptFailure(lines, 'E117:', 0) endif enddef @@ -2590,6 +2590,7 @@ def Test_expr7_register() CheckDefAndScriptFailure2(["@. = 'yes'"], 'E354:', 'E488:', 1) enddef +" This is slow when run under valgrind. def Test_expr7_namespace() var lines =<< trim END g:some_var = 'some' diff --git a/src/version.c b/src/version.c index 2d3368dab..86b0593dd 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 */ /**/ + 2715, +/**/ 2714, /**/ 2713, |