patch 9.1.1438: tests: Test_breakindent_list_split() fails
Commit:
https://github.com/vim/vim/commit/c4eb1cb17b869f7108ebfe42204924bed0436ad1
Author: Aliaksei Budavei <0x000...@gmail.com>
Date: Sun Jun 8 15:52:42 2025 +0200
patch 9.1.1438: tests: Test_breakindent_list_split() fails
Problem: tests: Test_breakindent_list_split() fails
(Phạm Bình An)
Solution: Always reset "&columns" and "&lines" for GUI builds
(Aliaksei Budavei)
Ensure that "&columns" and "&lines" are always set to their
default values before calling "SetUp()", if any, for EACH
test run by a GUI build to avoid yet-to-be-run tests from
inheriting possibly changed values (after window resizing)
and leading to broken assumptions about available estate and
occasional test failures.
fixes: #17453
closes: #17447
Signed-off-by: Aliaksei Budavei <0x000...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 0d5312155..f03fe4449 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -56,10 +56,17 @@ silent! endwhile
" In the GUI we can always change the screen size.
if has('gui_running')
if has('gui_gtk')
- " to keep screendump size unchanged
+ " Use e.g. SetUp() and TearDown() to change "&guifont" when needed;
+ " otherwise, keep the following value to match current screendumps.
set guifont=Monospace\ 10
endif
- set columns=80 lines=25
+
+ func s:SetDefaultOptionsForGUIBuilds()
+ set columns=80 lines=25
+ endfunc
+else
+ func s:SetDefaultOptionsForGUIBuilds()
+ endfunc
endif
" Check that the screen size is at least 24 x 80 characters.
@@ -272,6 +279,9 @@ func RunTheTest(test)
" directory after executing the test.
let save_cwd = getcwd()
+ " Permit "SetUp()" implementations to override default settings.
+ call s:SetDefaultOptionsForGUIBuilds()
+
if exists("*SetUp")
try
call SetUp()
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 5189b618c..91423eb96 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -1144,6 +1144,17 @@ endfunc
" Test for the hlset() function
func Test_hlset()
+ " FIXME: With GVim, _current_ test cases that are run before this one may
+ " influence the result of calling "hlset(hlget())", depending on what
+ " "&guifont" is set to. For example, introduce SetUp() as follows:
+ "
+ " if CanRunVimInTerminal() && has('gui_running') && has('gui_gtk')
+ " def SetUp()
+ " set guifont=Monospace\ 10
+ " enddef
+ " endif
+ "
+ " and see "E416: Missing equal sign: ... line 4" for this test case.
let lines =<< trim END
call assert_equal(0, hlset(test_null_list()))
call assert_equal(0, hlset([]))
diff --git a/src/version.c b/src/version.c
index 3d83858ba..6896410fb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1438,
/**/
1437,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uOGZC-007U07-W4%40256bit.org.
