summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-21 18:17:14 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-21 18:17:14 +0100
commit3876789b2326c9e5ab70c0292e988c89504c14b4 (patch)
treec472bebefff2f0d074c01c7690f3e4807221f1db
parente86ecbd92271ad86b543c71ca50452528f704ffb (diff)
downloadvim-git-3876789b2326c9e5ab70c0292e988c89504c14b4.tar.gz
patch 8.1.0966: one terminal test is flakyv8.1.0966
Problem: One terminal test is flaky. Solution: Add 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 383e6270d..9108b8e68 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -307,6 +307,7 @@ let s:flaky_tests = [
\ 'Test_terminal_ansicolors_func()',
\ 'Test_terminal_ansicolors_global()',
\ 'Test_terminal_composing_unicode()',
+ \ 'Test_terminal_does_not_truncate_last_newlines()',
\ 'Test_terminal_env()',
\ 'Test_terminal_hide_buffer()',
\ 'Test_terminal_make_change()',
diff --git a/src/version.c b/src/version.c
index 328d65814..a732545d2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 966,
+/**/
965,
/**/
964,