summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-30 21:37:58 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-30 21:37:58 +0200
commitd09be321422669fc32d4d31a4ac7621c89136f7b (patch)
tree9895bbf97e210f8d5431fd8a2258423b5eaca32a
parentb000e328efcf859d14454ffd241d44f6d14f300b (diff)
patch 8.0.0822: Test_with_partial_callback is a tiny bit flakyv8.0.0822
Problem: Test_with_partial_callback is a tiny bit flaky. Solution: Add it 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 c57ec5f642..b1d9d947f7 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -233,6 +233,7 @@ let s:flaky = [
\ 'Test_quoteplus()',
\ 'Test_quotestar()',
\ 'Test_reltime()',
+ \ 'Test_with_partial_callback()',
\ ]
" Locate Test_ functions and execute them.
diff --git a/src/version.c b/src/version.c
index 875119f416..145fcdc7c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 822,
+/**/
821,
/**/
820,