changeset 13692:2dd14253ad12 v8.0.1718

patch 8.0.1718: terminal scrollback test fails on MS-Windows commit https://github.com/vim/vim/commit/6c672194cd06fb1ab1289475aad31a9769bdb2ad Author: Bram Moolenaar <Bram@vim.org> Date: Sun Apr 15 13:28:42 2018 +0200 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.
author Christian Brabandt <cb@256bit.org>
date Sun, 15 Apr 2018 13:30:06 +0200
parents a0ee57b04deb
children c31f156cf41d
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -281,7 +281,8 @@ func Test_terminal_scrollback()
     call term_sendkeys(buf, "cat Xtext\<CR>")
   endif
   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('$')
   call assert_inrange(91, 100, lines)
 
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1718,
+/**/
     1717,
 /**/
     1716,