commit 46fad2ef0bd5124f1be22c807214c243fb5611d8
author Bram Moolenaar <Bram@vim.org> Sun Aug 19 16:09:27 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Aug 19 16:09:27 2018 +0200
tree 9e210d34615057d48ce1f0d4ee41eaeb65d25cb0
parent cea1f9ec5256755ad119526fea2ef6811f7b53cd

patch 8.1.0298: window resize test sometimes fails on Mac

Problem:    Window resize test sometimes fails on Mac.
Solution:   Add Test_popup_and_window_resize() to flaky tests.

src/testdir/runtest.vim

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 4f508a4..fa621f4 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -272,6 +272,7 @@
       \ 'Test_paused()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()',
+      \ 'Test_popup_and_window_resize()',  " sometimes fails on Mac
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
       \ 'Test_reltime()',

src/version.c

diff --git a/src/version.c b/src/version.c
index 99f86e7..ac39425 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    298,
+/**/
     297,
 /**/
     296,