patch 8.1.0186: test for getwininfo() fails in GUI

Problem:    Test for getwininfo() fails in GUI.
Solution:   Account for missing tabline.

diff --git a/src/testdir/test_bufwintabinfo.vim b/src/testdir/test_bufwintabinfo.vim
index bcf3c52ed0f2b05a56f1598e37ba6ddbf4320e60..d88b061ac726085030e62504df8075d88b5b5e6b 100644 (file)
--- a/src/testdir/test_bufwintabinfo.vim
+++ b/src/testdir/test_bufwintabinfo.vim
@@ -53,15 +53,16 @@ function Test_getbufwintabinfo()
     call assert_equal(5, len(winlist))
     call assert_equal(winwidth(1), winlist[0].width)
     call assert_equal(0, winlist[0].wincol)
-    call assert_equal(1, winlist[0].winrow)  " tabline adds one
+    let tablineheight = winlist[0].winrow == 1 ? 1 : 0
+    call assert_equal(tablineheight, winlist[0].winrow)  " tabline adds one
 
     call assert_equal(winbufnr(2), winlist[1].bufnr)
     call assert_equal(winheight(2), winlist[1].height)
     call assert_equal(0, winlist[1].wincol)
-    call assert_equal(winheight(1) + 2, winlist[1].winrow)
+    call assert_equal(tablineheight + winheight(1) + 1, winlist[1].winrow)
 
     call assert_equal(1, winlist[2].winnr)
-    call assert_equal(1, winlist[2].winrow)
+    call assert_equal(tablineheight, winlist[2].winrow)
     call assert_equal(0, winlist[2].wincol)
 
     call assert_equal(winlist[2].width + 1, winlist[3].wincol)

diff --git a/src/version.c b/src/version.c
index f638db610ae62938951147c38e25b4f0ee20b232..08e39b4d4d93b9dc7bad0412b1c9a4ffac035285 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    186,
 /**/
     185,
 /**/