summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-11-11 18:51:42 +0100
committerBram Moolenaar <Bram@vim.org>2018-11-11 18:51:42 +0100
commit218959bc91f3a2e1cbd2fb2290fd5cba708b1c33 (patch)
tree1e4a524fc0044f881d6e2d1ad7ab93f42eb75a2f
parentf49cc60aa802862c595ff619dccc11271633a94b (diff)
patch 8.1.0520: screen diff test sometimes failsv8.1.0520
Problem: Screen diff test sometimes fails. Solution: Add to list of flaky tests.
-rw-r--r--src/testdir/runtest.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index ff32abcc32..cacfa75589 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -279,6 +279,7 @@ let s:flaky = [
\ 'Test_collapse_buffers()',
\ 'Test_communicate()',
\ 'Test_cwd()',
+ \ 'Test_diff_screen()',
\ 'Test_exit_callback_interval()',
\ 'Test_nb_basic()',
\ 'Test_oneshot()',
diff --git a/src/version.c b/src/version.c
index ad815fb170..e3491a0023 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 520,
+/**/
519,
/**/
518,