thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1718: terminal scrollback test fails on MS-Windows

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2018-04-15 13:28:42 +02:00
parent 3cba73423e
commit 6c672194cd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_terminal.vim
View File

@@ -281,7 +281,8 @@ func Test_terminal_scrollback()
call term_sendkeys(buf, "cat Xtext\<CR>") call term_sendkeys(buf, "cat Xtext\<CR>")
endif endif
let rows = term_getsize(buf)[0] let rows = term_getsize(buf)[0]
call WaitFor({-> term_getline(buf, rows - 1) =~ '149'}) " On MS-Windows there is an empty line, check both last line and above it.
call WaitFor({-> term_getline(buf, rows - 1) . term_getline(buf, rows - 2) =~ '149'})
let lines = line('$') let lines = line('$')
call assert_inrange(91, 100, lines) call assert_inrange(91, 100, lines)

2
src/version.c
View File

@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1718,
/**/ /**/
1717, 1717,
/**/ /**/