From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 19 Aug 2018 14:09:27 +0000 (+0200)
Subject: patch 8.1.0298: window resize test sometimes fails on Mac
X-Git-Tag: v8.1.0298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46fad2ef0bd5124f1be22c807214c243fb5611d8;p=thirdparty%2Fvim.git

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.
---

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 4f508a4875..fa621f4978 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -272,6 +272,7 @@ let s:flaky = [
       \ '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()',
diff --git a/src/version.c b/src/version.c
index 99f86e70c8..ac39425536 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    298,
 /**/
     297,
 /**/