summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-25 23:22:05 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-25 23:22:05 +0200
commit753289f9bf71c0528f00d803a39d017184640e9d (patch)
treefb2364ee4f94af87f54867a4c65fba56f7395d17
parentbe0b72977f1f1de14f231b5879d5c600ba72c6a6 (diff)
downloadvim-git-8.0.0995.tar.gz
patch 8.0.0995: terminal tests fail on Macv8.0.0995
Problem: Terminal tests fail on Mac. Solution: Add workaround: sleep a moment in between sending keys.
-rw-r--r--src/testdir/test_terminal.vim5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index bdc5655d5..2356f2c53 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -456,6 +456,11 @@ func Test_terminal_noblock()
for c in ['a','b','c','d','e','f','g','h','i','j','k']
call term_sendkeys(g:buf, 'echo ' . repeat(c, 5000) . "\<cr>")
+ if has('mac')
+ " TODO: this should not be needed, but without it sending keys blocks
+ " after 8000 chars or so.
+ sleep 100m
+ endif
endfor
call term_sendkeys(g:buf, "echo done\<cr>")
diff --git a/src/version.c b/src/version.c
index 318053950..9ce38f03a 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 */
/**/
+ 995,
+/**/
994,
/**/
993,