summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-14 22:26:20 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-14 22:26:20 +0200
commit3c8cd4a1dcbc34d8818a2a38b1d1e4755da9edc2 (patch)
tree9e33af82e77ac2788ab6ee84905b00a148b95fa8
parent03b00476eed43dbc25222549c00b3af28e79b350 (diff)
patch 8.1.2151: state test is a bit flakyv8.1.2151
Problem: State test is a bit flaky. Solution: Add to the 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 e1ea7f1e68..a8eb5e23b0 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -341,6 +341,7 @@ let s:flaky_tests = [
\ 'Test_raw_one_time_callback()',
\ 'Test_reltime()',
\ 'Test_server_crash()',
+ \ 'Test_state()',
\ 'Test_term_mouse_double_click_to_create_tab()',
\ 'Test_terminal_ansicolors_default()',
\ 'Test_terminal_ansicolors_func()',
diff --git a/src/version.c b/src/version.c
index a8dc708142..c1c3442164 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2151,
+/**/
2150,
/**/
2149,