summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-02 18:30:36 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-02 18:30:36 +0100
commit218101442e8775bd1f05d1dda18d3946ee032dd1 (patch)
tree3ffbad473036f4dcaf32a9053ccd38e33b45b437
parentd4a282f7a5efb2bf28fbd947251e512f08563738 (diff)
patch 8.0.1453: terminal test fails on some slow terminalsv8.0.1453
Problem: Terminal test fails on some slow terminals. Solution: Increase timeout to 10 seconds.
-rw-r--r--src/testdir/test_terminal.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 18d2815fb1..0c2e289c10 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -522,7 +522,7 @@ func Test_terminal_noblock()
" On MS-Windows there is an extra empty line below "done". Find "done" in
" the last-but-one or the last-but-two line.
let lnum = term_getsize(buf)[0] - 1
- call WaitFor({-> term_getline(buf, lnum) =~ "done" || term_getline(buf, lnum - 1) =~ "done"}, 3000)
+ call WaitFor({-> term_getline(buf, lnum) =~ "done" || term_getline(buf, lnum - 1) =~ "done"}, 10000)
let line = term_getline(buf, lnum)
if line !~ 'done'
let line = term_getline(buf, lnum - 1)
diff --git a/src/version.c b/src/version.c
index 054949439c..cd994600b6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1453,
+/**/
1452,
/**/
1451,