summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-05-14 12:34:43 +0100
committerBram Moolenaar <Bram@vim.org>2022-05-14 12:34:43 +0100
commit98feacedf9c03b8db79da03508a2c3c25dac3e53 (patch)
treeda99ddbe5c3f0aa55cd0b99eff8a84705ac6ea29
parentde5cf287812510d2c8ffe66b99cf33c4e1a6e6f1 (diff)
patch 8.2.4952: GUI test will fail if color scheme changesv8.2.4952
Problem: GUI test will fail if color scheme changes. Solution: Reduce the test for now.
-rw-r--r--src/testdir/test_gui.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index bc3c698055..6cbb83651f 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -48,7 +48,9 @@ func Test_colorscheme()
call assert_equal("\ntorte", execute('colorscheme'))
let a = substitute(execute('hi Search'), "\n\\s\\+", ' ', 'g')
- call assert_match("\nSearch xxx term=reverse ctermfg=0 ctermbg=12 gui=bold guifg=Black guibg=Red", a)
+ " FIXME: temporarily check less while the colorscheme changes
+ " call assert_match("\nSearch xxx term=reverse cterm=reverse ctermfg=196 ctermbg=16 gui=reverse guifg=#ff0000 guibg=#000000", a)
+ call assert_match("\nSearch xxx term=reverse ", a)
call assert_fails('colorscheme does_not_exist', 'E185:')
diff --git a/src/version.c b/src/version.c
index c9ec30111b..9017eeb1f5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4952,
+/**/
4951,
/**/
4950,