summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Pellé <dominique.pelle@gmail.com>2024-07-07 20:37:12 +0200
committerChristian Brabandt <cb@256bit.org>2024-07-07 20:37:12 +0200
commit52123879c0c64c64ca6071192a9f8eacd822efd1 (patch)
tree6384761d4cbc7e55dbdb1d2b7d3c86c4589cc947
parentfc3f5dba52099d82ccc8bfe309d58a6fac01373d (diff)
patch 9.1.0541: failing test with Vim configured without channelv9.1.0541
Problem: failing test with Vim configured without channel Solution: In the test Test_null_values() verify that the 'channel' and 'job' feature is present in Vim. (Dominique Pellé) Test `Test_null_values` was failing when vim is configured without channel because the test uses function `null_channel()` (which requires the `+channel` feature) and using `null_job()` which requires the `+job` feature. But was reproducible when vim is configured with: ``` ./configure --with-features=huge --enable-gui=none --disable-channel ``` Only check `null_channel()` when the `+channel` feature is available. Only check `null_job()` when the `+job` feature is available. closes: #15177 Signed-off-by: Dominique Pellé <dominique.pelle@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/testdir/test_vim9_script.vim8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 0b17150094..a169c79114 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -5085,15 +5085,19 @@ def Test_null_values()
var nullValues = [
[null, 1, 'null', 7, 'special'],
[null_blob, 1, '0z', 10, 'blob'],
- [null_channel, 1, 'channel fail', 9, 'channel'],
[null_dict, 1, '{}', 4, 'dict<any>'],
[null_function, 1, "function('')", 2, 'func(...): unknown'],
- [null_job, 1, 'no process', 8, 'job'],
[null_list, 1, '[]', 3, 'list<any>'],
[null_object, 1, 'object of [unknown]', 13, 'object<Unknown>'],
[null_partial, 1, "function('')", 2, 'func(...): unknown'],
[null_string, 1, "''", 1, 'string']
]
+ if has('channel')
+ nullValues->add([null_channel, 1, 'channel fail', 9, 'channel'])
+ endif
+ if has('job')
+ nullValues->add([null_job, 1, 'no process', 8, 'job'])
+ endif
for [Val, emptyExp, stringExp, typeExp, typenameExp] in nullValues
assert_equal(emptyExp, empty(Val))
diff --git a/src/version.c b/src/version.c
index da584b9af2..f9efacf3c4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 541,
+/**/
540,
/**/
539,