changeset 19273:a4b65930a0dc v8.2.0195

patch 8.2.0195: some tests fail when run in the GUI Commit: https://github.com/vim/vim/commit/3180fe6c6dc0728d21c6318b957022b029c234f0 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 2 13:47:06 2020 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 02 Feb 2020 14:00:05 +0100
parents 4bebe4172547
children ca1f1b78a0b4
files src/testdir/check.vim src/testdir/test_highlight.vim src/testdir/test_terminal.vim src/version.c
diffstat 4 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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'
 
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -594,6 +594,8 @@ endfunc
 
 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 @@ func Test_1_highlight_Normalgroup_exists
   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')))
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2331,7 +2331,7 @@ func Test_terminal_in_popup()
     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',
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    195,
+/**/
     194,
 /**/
     193,