summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-07 22:24:41 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-07 22:24:41 +0200
commit75a60f74ce1000b0ffed2e6a203a05f3cd160c6a (patch)
treeabecb5a9f5d0ee57dcb712fcc86c884e7f687407
parent37b53270e1a65d1d56187a3d68439e666e8b75fd (diff)
downloadvim-git-75a60f74ce1000b0ffed2e6a203a05f3cd160c6a.tar.gz
patch 8.0.1070: terminal test is flaky on Macv8.0.1070
Problem: Terminal test is flaky on Mac. Solution: Add Test_terminal_noblock() to 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 b1d9d947f..d07710afc 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_terminal_noblock()',
\ 'Test_with_partial_callback()',
\ ]
diff --git a/src/version.c b/src/version.c
index 094f05f12..8750360c9 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 */
/**/
+ 1070,
+/**/
1069,
/**/
1068,