diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-19 16:09:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-19 16:09:27 +0200 |
| commit | 46fad2ef0bd5124f1be22c807214c243fb5611d8 (patch) | |
| tree | 9e210d34615057d48ce1f0d4ee41eaeb65d25cb0 | |
| parent | cea1f9ec5256755ad119526fea2ef6811f7b53cd (diff) | |
| download | vim-git-46fad2ef0bd5124f1be22c807214c243fb5611d8.tar.gz | |
patch 8.1.0298: window resize test sometimes fails on Macv8.1.0298
Problem: Window resize test sometimes fails on Mac.
Solution: Add Test_popup_and_window_resize() to flaky tests.
| -rw-r--r-- | src/testdir/runtest.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 4f508a487..fa621f497 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 99f86e70c..ac3942553 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 298, +/**/ 297, /**/ 296, |