summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-27 21:35:53 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-27 21:35:53 +0100
commitd512e17ea4cebe547197b759a047138228acc06f (patch)
tree07344724512e840f8acac882a0078a7be1efa1c8
parent10a8da0594406c37f8971cbd16ebbebf831dc60f (diff)
downloadvim-git-8.0.0384.tar.gz
patch 8.0.0384: timer test failed for no apparent reasonv8.0.0384
Problem: Timer test failed for no apparent reason. Solution: Mark the test as flaky.
-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 0c0a19790..71028a191 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -165,6 +165,7 @@ let s:flaky = [
\ 'Test_collapse_buffers()',
\ 'Test_communicate()',
\ 'Test_nb_basic()',
+ \ 'Test_oneshot()',
\ 'Test_pipe_through_sort_all()',
\ 'Test_pipe_through_sort_some()',
\ 'Test_reltime()',
diff --git a/src/version.c b/src/version.c
index 232b65dc8..713b54c2b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 384,
+/**/
383,
/**/
382,