diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-02 13:47:06 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-02 13:47:06 +0100 |
| commit | 3180fe6c6dc0728d21c6318b957022b029c234f0 (patch) | |
| tree | 0217a018ee9c4011810e988396e775fe3ef9ecaa | |
| parent | 3c01c4a02897163996639f6f2604c68eab2bd18b (diff) | |
patch 8.2.0195: some tests fail when run in the GUIv8.2.0195
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.
| -rw-r--r-- | src/testdir/check.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_highlight.vim | 5 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/check.vim b/src/testdir/check.vim index 6efa348e5a..687610195b 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 f718e90dfb..ac6a10102e 100644 --- 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'))) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 7fda9f65b5..3ff5db6852 100644 --- 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', diff --git a/src/version.c b/src/version.c index 549c78c8b1..65d961d02e 100644 --- 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, |