patch 9.1.1282: Build and test failure without job feature

Problem:  Build and test failure without job feature
          (lazypingu)
Solution: Adjust ifdefs, add CheckFeature job to tests

fixes: #17053
closes: #17059

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/feature.h b/src/feature.h
index bcfc4a40c0a2efc9578c3f571cb0e0d85d1afe09..703a72fc9e988898c43ec3c932a943300d81fcb2 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -1015,12 +1015,6 @@
  * +tgetent
  */
 
-/*
- * The Netbeans feature requires +eval.
- */
-#if !defined(FEAT_EVAL) && defined(FEAT_NETBEANS_INTG)
-# undef FEAT_NETBEANS_INTG
-#endif
 
 /*
  * The +channel feature requires +eval.
@@ -1029,6 +1023,13 @@
 # undef FEAT_JOB_CHANNEL
 #endif
 
+/*
+ * The Netbeans feature requires +eval and +job_channel
+ */
+#if (!defined(FEAT_EVAL) || !defined(FEAT_JOB_CHANNEL)) && defined(FEAT_NETBEANS_INTG)
+# undef FEAT_NETBEANS_INTG
+#endif
+
 /*
  * +terminal           ":terminal" command.  Runs a terminal in a window.
  *                     requires +channel

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 7d65cb61eb8db9837004205ece367c5cdba9d689..7a3a1864d392702977718a0df4c651a5aa92ebc7 100644 (file)
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -1648,6 +1648,7 @@ def Test_foldtextresult()
 enddef
 
 def Test_foreach()
+  CheckFeature job
   v9.CheckSourceDefAndScriptFailure(['foreach(test_null_job(), "")'], ['E1013: Argument 1: type mismatch, expected list<any> but got job', 'E1251: List, Tuple, Dictionary, Blob or String required for argument 1'])
 enddef
 

diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index 5c88ec6237fb59a67c22184364791ada922521fb..16dd70c9d20fbc81cd7e04cecd44cab6c69510a1 100644 (file)
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -7521,6 +7521,7 @@ endfunc
 
 " Test for 'for' loop failures
 func Test_for_loop_failure()
+  CheckFeature job
   func ForFn()
     for x in test_null_job()
     endfor

diff --git a/src/version.c b/src/version.c
index a900afc7b1c6156e129e76fdf445265a5a5b0a0c..bab345d6dfacf1e1fc670c6e40f0b95b618e086f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1282,
 /**/
     1281,
 /**/