Skip to content

Commit 6c67219

Browse files
committed
patch 8.0.1718: terminal scrollback test fails on MS-Windows
Problem: Terminal scrollback test fails on MS-Windows. Solution: Check for the last line of output anticipating there might be an empty line below it.
1 parent 3cba734 commit 6c67219

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/testdir/test_terminal.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@ func Test_terminal_scrollback()
281281
call term_sendkeys(buf, "cat Xtext\<CR>")
282282
endif
283283
let rows = term_getsize(buf)[0]
284-
call WaitFor({-> term_getline(buf, rows - 1) =~ '149'})
284+
" On MS-Windows there is an empty line, check both last line and above it.
285+
call WaitFor({-> term_getline(buf, rows - 1) . term_getline(buf, rows - 2) =~ '149'})
285286
let lines = line('$')
286287
call assert_inrange(91, 100, lines)
287288

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,8 @@ static char *(features[]) =
762762

763763
static int included_patches[] =
764764
{ /* Add new patch number below this line */
765+
/**/
766+
1718,
765767
/**/
766768
1717,
767769
/**/

0 commit comments

Comments
 (0)