summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-04 21:11:32 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-04 21:11:32 +0200
commitfe9489233c463dd87046df3fd95332e47b66e93c (patch)
tree350a26632125ee2dbce28041636e921a58a4cec0
parent877e95779869c5426102aa491f67d99904c8534c (diff)
patch 7.4.2154v7.4.2154
Problem: Test_communicate() fails sometimes. Solution: Add it to the 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 d7c0516803..8f0c0c3c80 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -131,7 +131,7 @@ else
endif
" Names of flaky tests.
-let s:flaky = ['Test_reltime()', 'Test_nb_basic()']
+let s:flaky = ['Test_reltime()', 'Test_nb_basic()', 'Test_communicate()']
" Locate Test_ functions and execute them.
set nomore
diff --git a/src/version.c b/src/version.c
index 992b374d62..c99fff65d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2154,
+/**/
2153,
/**/
2152,