summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-04 20:46:40 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-04 20:46:40 +0100
commit7dd88c5133feda7e9ccfedcb38b6dfdba459d507 (patch)
tree9e6407a8fcec496ad6474315de5967e8aeef31c3
parent1232624ae5b56c167c5982a2620f736c4bbc19ef (diff)
downloadvim-git-7dd88c5133feda7e9ccfedcb38b6dfdba459d507.tar.gz
patch 8.0.1262: terminal redir test is flakyv8.0.1262
Problem: Terminal redir test is 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 a35944830..08c0e684b 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -252,6 +252,7 @@ let s:flaky = [
\ 'Test_reltime()',
\ 'Test_terminal_composing_unicode()',
\ 'Test_terminal_noblock()',
+ \ 'Test_terminal_redir_file()',
\ 'Test_with_partial_callback()',
\ ]
diff --git a/src/version.c b/src/version.c
index 7d049d08f..b7cb58be4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1262,
+/**/
1261,
/**/
1260,