patch 8.2.0195: some tests fail when run in the GUI
Problem: Some tests fail when run in the GUI.
Solution: Make sure the window width is enough. In the GUI run terminal Vim
in the terminal, if possible.
diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index 6efa348..6876101 100644
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -1,4 +1,5 @@
source shared.vim
+source term_util.vim
command -nargs=1 MissingFeature throw 'Skipped: ' .. <args> .. ' feature missing'
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index f718e90..ac6a101 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -594,6 +594,8 @@
func Test_wincolor()
CheckScreendump
+ " make sure the width is enough for the test
+ set columns=80
let lines =<< trim END
set cursorline cursorcolumn rnu
@@ -686,7 +688,8 @@
endif
endfunc
-function Test_no_space_before_xxx()
+" Do this test last, sometimes restoring the columns doesn't work
+function Test_z_no_space_before_xxx()
let l:org_columns = &columns
set columns=17
let l:hi_StatusLineTermNC = join(split(execute('hi StatusLineTermNC')))
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 7fda9f6..3ff5db6 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2331,7 +2331,7 @@
in a popup window
END
call writefile(text, 'Xtext')
- let cmd = GetVimCommandClean()
+ let cmd = GetVimCommandCleanTerm()
let lines = [
\ 'call setline(1, range(20))',
\ 'hi PopTerm ctermbg=grey',
diff --git a/src/version.c b/src/version.c
index 549c78c..65d961d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 195,
+/**/
194,
/**/
193,