summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-01 18:00:13 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-01 18:00:13 +0100
commitb245559fa9b03bfb0d0f77023120e60d870f0b56 (patch)
treede40503e1e191b9a1d0c909aa24bd1c1e46dbc71 /src
parente90858d0229444b3cd16b1cd3a8d61a24c435705 (diff)
downloadvim-git-b245559fa9b03bfb0d0f77023120e60d870f0b56.tar.gz
patch 8.0.0284: collapse buffers test failed oncev8.0.0284
Problem: The Test_collapse_buffers() test failed once, looks like it is flaky. Solution: Add it to the list of flaky tests.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/runtest.vim7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index c7028d2a6..c2260c7b7 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -153,12 +153,13 @@ endif
" Names of flaky tests.
let s:flaky = [
- \ 'Test_reltime()',
- \ 'Test_nb_basic()',
- \ 'Test_communicate()',
\ 'Test_close_and_exit_cb()',
+ \ 'Test_collapse_buffers()',
+ \ 'Test_communicate()',
+ \ 'Test_nb_basic()',
\ 'Test_pipe_through_sort_all()',
\ 'Test_pipe_through_sort_some()'
+ \ 'Test_reltime()',
\ ]
" Locate Test_ functions and execute them.
diff --git a/src/version.c b/src/version.c
index ef5ddaee2..6b0953fdf 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 */
/**/
+ 284,
+/**/
283,
/**/
282,