vim/backport-patch-8.2.0195-some-tests-fail-when-run-in-the-GUI.patch
2022-09-06 17:18:05 +08:00

50 lines
1.5 KiB
Diff

From 3180fe6c6dc0728d21c6318b957022b029c234f0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 2 Feb 2020 13:47:06 +0100
Subject: [PATCH] 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.
---
src/testdir/check.vim | 1 +
src/testdir/test_highlight.vim | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index 30c4158..0c375e3 100644
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -1,4 +1,5 @@
source shared.vim
+source term_util.vim
" Command to check for the presence of a feature.
command -nargs=1 CheckFeature call CheckFeature(<f-args>)
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index f63abee..ea4fa7f 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
@@ -685,7 +687,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')))
--
2.33.0