commit 705724e430abd10ffdd5f1a2bb5a8f9223ff5cdd
author Bram Moolenaar <Bram@vim.org> Fri Jan 31 21:13:42 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Fri Jan 31 21:13:42 2020 +0100
tree 51489385f1e182edb46c39108fda58e4b118eea3
parent a259d8d30bc289764925fc42db1dbe774f0bb3f8

patch 8.2.0186: a couple of tests may fail when features are missing

Problem:    A couple of tests may fail when features are missing.
Solution:   Check for features. (Dominique Pelle, closes #5561)

src/testdir/test_functions.vim

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 6629d42..4f417fa 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1999,7 +1999,7 @@
   set tagfunc=
   
   " term_start()
-  if has('terminal')
+  if has('terminal') && has('termguicolors')
     call assert_fails('call term_start(range(3, 4))', 'E474:')
     let g:terminal_ansi_colors = range(16)
     call assert_fails('call term_start("ls", #{term_finish: "close"})', 'E475:')

src/testdir/test_highlight.vim

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index f63abee..f718e90 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -622,6 +622,7 @@
 
 func Test_wincolor_listchars()
   CheckScreendump
+  CheckFeature conceal
 
   let lines =<< trim END
 	call setline(1, ["one","\t\tsome random text enough long to show 'extends' and 'precedes' includingnbsps, preceding tabs and trailing spaces    ","three"])

src/version.c

diff --git a/src/version.c b/src/version.c
index e7a6f6f..839617a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    186,
+/**/
     185,
 /**/
     184,