From eef0531621c8d4045d669eb815b051d925983df8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 20 Aug 2017 20:21:23 +0200 Subject: patch 8.0.0979: terminal noblock test fails on MS-Windows Problem: Terminal noblock test fails on MS-Windows. (Christian Brabandt) Solution: Ignore empty line below "done". --- src/testdir/test_terminal.vim | 11 +++++++++-- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index b3868553e..bdc5655d5 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -458,9 +458,16 @@ func Test_terminal_noblock() call term_sendkeys(g:buf, 'echo ' . repeat(c, 5000) . "\") endfor call term_sendkeys(g:buf, "echo done\") + + " 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 g:lnum = term_getsize(g:buf)[0] - 1 - call WaitFor('term_getline(g:buf, g:lnum) =~ "done"', 3000) - call assert_match('done', term_getline(g:buf, g:lnum)) + call WaitFor('term_getline(g:buf, g:lnum) =~ "done" || term_getline(g:buf, g:lnum - 1) =~ "done"', 3000) + let line = term_getline(g:buf, g:lnum) + if line !~ 'done' + let line = term_getline(g:buf, g:lnum - 1) + endif + call assert_match('done', line) let g:job = term_getjob(g:buf) call Stop_shell_in_terminal(g:buf) diff --git a/src/version.c b/src/version.c index 0488c199d..5d97014c0 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 */ +/**/ + 979, /**/ 978, /**/ -- cgit v1.2.1