summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-16 10:51:10 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-16 10:51:10 +0200
commit973d5304a44c974e74e43c3790f8919b7d4193b4 (patch)
tree498fe342a9fe97307b4ac9070e65d8022a5b6e8b
parent52953194afccbcb6c2fd013b7a9e2cfbf202b9d0 (diff)
downloadvim-git-973d5304a44c974e74e43c3790f8919b7d4193b4.tar.gz
patch 8.1.1854: now another timer test is flakyv8.1.1854
Problem: Now another timer test is flaky. Solution: Add test 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 fe02d889c..7530bb9d5 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -336,6 +336,7 @@ let s:flaky_tests = [
\ 'Test_repeat_many()',
\ 'Test_repeat_three()',
\ 'Test_server_crash()',
+ \ 'Test_stop_all_in_callback()',
\ 'Test_terminal_ansicolors_default()',
\ 'Test_terminal_ansicolors_func()',
\ 'Test_terminal_ansicolors_global()',
diff --git a/src/version.c b/src/version.c
index 38290c6b6..e497399d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1854,
+/**/
1853,
/**/
1852,