summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-11-16 18:50:19 +0100
committerBram Moolenaar <Bram@vim.org>2018-11-16 18:50:19 +0100
commit447f6ce8bd42fe3adbdf97eff9a38a9bfef9eeed (patch)
treed639884b33982b8ad89ccbf2b19409a2d54c5dd3
parent2d67d307ee5dba911e8fbe73193bf596ebf76c1a (diff)
downloadvim-git-447f6ce8bd42fe3adbdf97eff9a38a9bfef9eeed.tar.gz
patch 8.1.0533: screendump tests can be flakyv8.1.0533
Problem: Screendump tests can be flaky. Solution: Add VerifyScreenDump to the pattern of flaky tests.
-rw-r--r--src/testdir/runtest.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 9ba5d137d..56bb3d359 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -330,7 +330,7 @@ let s:flaky_tests = [
\ ]
" Pattern indicating a common flaky test failure.
-let s:flaky_errors_re = 'StopVimInTerminal'
+let s:flaky_errors_re = 'StopVimInTerminal\|VerifyScreenDump'
" Locate Test_ functions and execute them.
redir @q
diff --git a/src/version.c b/src/version.c
index f6be0c0f5..560abd4f8 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 */
/**/
+ 533,
+/**/
532,
/**/
531,