changeset 29247:5f314b2ed494 v8.2.5142

patch 8.2.5142: startup test fails if there is a status bar Commit: https://github.com/vim/vim/commit/fa04eae5a5b9394079bde2d37ce6f9f8a5567d48 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jun 21 14:38:40 2022 +0100 patch 8.2.5142: startup test fails if there is a status bar Problem: Startup test fails if there is a status bar at the top of the screen. (Ernie Rael) Solution: Use a larger vertical offset in the test.
author Bram Moolenaar <Bram@vim.org>
date Tue, 21 Jun 2022 18:45:07 +0200
parents 3415983cabfb
children 6a718a4e17ce
files src/testdir/test_startup.vim src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -531,7 +531,9 @@ func Test_geometry()
       call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry")
       qall
     [CODE]
-    if RunVim([], after, '-f -g -geometry 31x13+41+43')
+    " Some window managers have a bar at the top that pushes windows down,
+    " need to use at least 130, let's do 150
+    if RunVim([], after, '-f -g -geometry 31x13+41+150')
       let lines = readfile('Xtest_geometry')
       " Depending on the GUI library and the windowing system the final size
       " might be a bit different, allow for some tolerance.  Tuned based on
@@ -539,8 +541,8 @@ func Test_geometry()
       call assert_inrange(31, 35, str2nr(lines[0]))
       call assert_equal('13', lines[1])
       call assert_equal('41', lines[2])
-      call assert_equal('43', lines[3])
-      call assert_equal('[41, 43]', lines[4])
+      call assert_equal('150', lines[3])
+      call assert_equal('[41, 150]', lines[4])
     endif
   endif
 
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5142,
+/**/
     5141,
 /**/
     5140,