changeset 22119:11dbf7e1f65c v8.2.1609

patch 8.2.1609: Vim9: test fails when build without +channel Commit: https://github.com/vim/vim/commit/7918238528090cd019dc19613dbe76923ac9a1d7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 5 20:06:33 2020 +0200 patch 8.2.1609: Vim9: test fails when build without +channel Problem: Vim9: test fails when build without +channel. Solution: Add check for +channel. (closes https://github.com/vim/vim/issues/6879)
author Bram Moolenaar <Bram@vim.org>
date Sat, 05 Sep 2020 20:15:03 +0200
parents 9a515354454d
children 70629b7d2db5
files src/testdir/test_vim9_expr.vim src/version.c
diffstat 2 files changed, 23 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1105,16 +1105,23 @@ def Test_expr5_vim9script()
       echo 'a' .. function('len')
   END
   CheckScriptFailure(lines, 'E729:', 2)
-  lines =<< trim END
-      vim9script
-      echo 'a' .. test_null_job()
-  END
-  CheckScriptFailure(lines, 'E908:', 2)
-  lines =<< trim END
-      vim9script
-      echo 'a' .. test_null_channel()
-  END
-  CheckScriptFailure(lines, 'E908:', 2)
+enddef
+
+def Test_expr5_vim9script_channel()
+  if !has('channel')
+    MissingFeature 'float'
+  else
+    let lines =<< trim END
+        vim9script
+        echo 'a' .. test_null_job()
+    END
+    CheckScriptFailure(lines, 'E908:', 2)
+    lines =<< trim END
+        vim9script
+        echo 'a' .. test_null_channel()
+    END
+    CheckScriptFailure(lines, 'E908:', 2)
+  endif
 enddef
 
 def Test_expr5_float()
@@ -1172,6 +1179,10 @@ func Test_expr5_fails()
   call CheckDefFailure(["let x = 'a' .. 0z32"], 'E1105', 1)
   call CheckDefFailure(["let x = 'a' .. function('len')"], 'E1105', 1)
   call CheckDefFailure(["let x = 'a' .. function('len', ['a'])"], 'E1105', 1)
+endfunc
+
+func Test_expr5_fails_channel()
+  CheckFeature channel
   call CheckDefFailure(["let x = 'a' .. test_null_job()"], 'E1105', 1)
   call CheckDefFailure(["let x = 'a' .. test_null_channel()"], 'E1105', 1)
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1609,
+/**/
     1608,
 /**/
     1607,