summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-09-25 21:03:02 +0200
committerBram Moolenaar <Bram@vim.org>2016-09-25 21:03:02 +0200
commit947000d6e481042d3869bd65b149d72511c31ab2 (patch)
treec342200a955ad8799e2bd271cd64bcd3a294e3ec
parent680e015bfe19be6772d3bd754486fbd45c1a9d3b (diff)
downloadvim-git-8.0.0011.tar.gz
patch 8.0.0011v8.0.0011
Problem: On OSX Test_pipe_through_sort_all() sometimes fails. Solution: Add the test 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 074ee572f..a3b5ea9c2 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -148,6 +148,7 @@ let s:flaky = [
\ 'Test_reltime()',
\ 'Test_nb_basic()',
\ 'Test_communicate()',
+ \ 'Test_pipe_through_sort_all()'
\ 'Test_pipe_through_sort_some()'
\ ]
diff --git a/src/version.c b/src/version.c
index 2a60f8b7b..036e99adf 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 */
/**/
+ 11,
+/**/
10,
/**/
9,