From b376aa2da4211fee7eaf16450bb8b37674e45bb0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 11 Oct 2021 16:08:32 +0100 Subject: [PATCH] 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 #8815) --- src/testdir/test_startup.vim | 9 ++++++++- src/version.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index dc320825c..b20954b25 100644 --- 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 diff --git a/src/version.c b/src/version.c index f5c8d76a5..2ef2946b4 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3495, /**/ 3494, /**/ -- 2.50.1