summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-24 12:12:30 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-24 12:12:30 +0100
commitf3710ee22d0039cea2f970452b5faf56e89a6ab0 (patch)
tree15f0e13852b0d6b0ced90bbc2ebe53eb5b89db07
parentd06dbf3f42c8a8a3967905dd2f2a31077af15438 (diff)
patch 8.2.0441: terminal noblock test is still failing on BSDv8.2.0441
Problem: Terminal noblock test is still failing on BSD. Solution: Reduce the amount of text.
-rw-r--r--src/testdir/test_terminal.vim9
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index cfbf67a412..f56c7facfc 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -662,22 +662,23 @@ endfunction
func Test_terminal_noblock()
let buf = term_start(&shell)
+ let wait_time = 5000
+ let letters = 'abcdefghijklmnopqrstuvwxyz'
if has('bsd') || has('mac') || has('sun')
" The shell or something else has a problem dealing with more than 1000
- " characters at the same time.
+ " characters at the same time. It's very slow too.
let len = 1000
let wait_time = 15000
+ let letters = 'abcdefghijklm'
" NPFS is used in Windows, nonblocking mode does not work properly.
elseif has('win32')
let len = 1
- let wait_time = 5000
else
let len = 5000
- let wait_time = 5000
endif
" Send a lot of text lines, should be buffered properly.
- for c in split('abcdefghijklmnopqrstuvwxyz', '\zs')
+ for c in split(letters, '\zs')
call term_sendkeys(buf, 'echo ' . repeat(c, len) . "\<cr>")
endfor
call term_sendkeys(buf, "echo done\<cr>")
diff --git a/src/version.c b/src/version.c
index 7e9c68cb43..0cf6011632 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 441,
+/**/
440,
/**/
439,