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 bcfc4a4..703a72f 100644
--- 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.
@@ -1030,6 +1024,13 @@
#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 7d65cb6..7a3a186 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -1648,6 +1648,7 @@
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 5c88ec6..16dd70c 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -7521,6 +7521,7 @@
" 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 a900afc..bab345d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1282,
+/**/
1281,
/**/
1280,