diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-10-11 16:08:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-11 16:08:32 +0100 |
| commit | b376aa2da4211fee7eaf16450bb8b37674e45bb0 (patch) | |
| tree | 5162e4b665c2b47732d1801cf802d7b26e3dbfe2 /src | |
| parent | b07626d4afa73dd2af0f03c0d59eed25ee159ef9 (diff) | |
| download | vim-git-b376aa2da4211fee7eaf16450bb8b37674e45bb0.tar.gz | |
patch 8.2.3495: GUI geometry startup test fails on some systemsv8.2.3495
Problem: GUI geometry startup test fails on some systems. (Drew Vogel)
Solution: Add tolerance to the size check. (closes #8815)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_startup.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 1 deletions
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 @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3495, +/**/ 3494, /**/ 3493, |