From d8d85bfb7d650d2fb584ea48aaaebdbc8a2e3dce Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 3 Sep 2017 18:08:00 +0200 Subject: [PATCH] patch 8.0.1049: shell on Mac can't handle long text Problem: Shell on Mac can't handle long text, making terminal test fail. Solution: Only write 1000 characters instead of 5000. --- src/testdir/test_terminal.vim | 14 ++++++++------ src/version.c | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index c70b61295..a16f3d906 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -458,14 +458,16 @@ endfunction func Test_terminal_noblock() let g:buf = term_start(&shell) + if has('mac') + " The shell or something else has a problem dealing with more than 1000 + " characters at the same time. + let len = 1000 + else + let len = 5000 + endif for c in ['a','b','c','d','e','f','g','h','i','j','k'] - call term_sendkeys(g:buf, 'echo ' . repeat(c, 5000) . "\") - if has('mac') - " TODO: this should not be needed, but without it sending keys blocks - " after 8000 chars or so. - sleep 100m - endif + call term_sendkeys(g:buf, 'echo ' . repeat(c, len) . "\") endfor call term_sendkeys(g:buf, "echo done\") diff --git a/src/version.c b/src/version.c index ce53bb815..4a5282fd7 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1049, /**/ 1048, /**/ -- 2.50.1