changeset 25923:70d1339c0fa0 v8.2.3495

patch 8.2.3495: GUI geometry startup test fails on some systems Commit: https://github.com/vim/vim/commit/b376aa2da4211fee7eaf16450bb8b37674e45bb0 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Oct 11 16:08:32 2021 +0100 patch 8.2.3495: GUI geometry startup test fails on some systems Problem: GUI geometry startup test fails on some systems. (Drew Vogel) Solution: Add tolerance to the size check. (closes https://github.com/vim/vim/issues/8815)
author Bram Moolenaar <Bram@vim.org>
date Mon, 11 Oct 2021 17:15:04 +0200
parents 81b51d907419
children e65b6cacc437
files src/testdir/test_startup.vim src/version.c
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -533,7 +533,14 @@ func Test_geometry()
     [CODE]
     if RunVim([], after, '-f -g -geometry 31x13+41+43')
       let lines = readfile('Xtest_geometry')
-      call assert_equal(['31', '13', '41', '43', '[41, 43]'], lines)
+      " Depending on the GUI library and the windowing system the final size
+      " might be a bit different, allow for some tolerance.  Tuned based on
+      " actual failures.
+      call assert_inrange(31, 35, 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])
     endif
   endif
 
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3495,
+/**/
     3494,
 /**/
     3493,