Mercurial > vim
changeset 15027:efd7bace40f4 v8.1.0525
patch 8.1.0525: terminal test skips part on Windows
commit https://github.com/vim/vim/commit/d3471e578506d5554ab99c4cd08af2a021c4f461
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Nov 12 21:42:24 2018 +0100
patch 8.1.0525: terminal test skips part on Windows
Problem: Terminal test skips part on Windows.
Solution: Fix Test_terminal_does_not_truncate_last_newlines(). (Hirohito
Higashi, closes #3606)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 12 Nov 2018 21:45:06 +0100 |
parents | 4f679be36482 |
children | 5abda25c040f |
files | src/Make_mvc.mak src/testdir/test_terminal.vim src/version.c |
diffstat | 3 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1269,7 +1269,8 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp tags: notags - $(CTAGS) *.c *.cpp *.h if_perl.xs + $(CTAGS) *.c *.cpp *.h + if exist auto\if_perl.c $(CTAGS) --append=yes auto\if_perl.c notags: - if exist tags del tags @@ -1323,7 +1324,7 @@ testclean: $(MAKE) /NOLOGO -f Make_dos.mak nolog $(MAKE) /NOLOGO -f Make_dos.mak $@.res $(MAKE) /NOLOGO -f Make_dos.mak report - cat messages + type messages cd .. ###########################################################################
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1660,12 +1660,6 @@ func Test_terminal_hidden_and_close() endfunc func Test_terminal_does_not_truncate_last_newlines() - " FIXME: currently doens't work for Windows - if has('win32') - return - endif - - let cmd = 'cat' let contents = [ \ [ 'One', '', 'X' ], \ [ 'Two', '', '' ], @@ -1674,11 +1668,15 @@ func Test_terminal_does_not_truncate_las for c in contents call writefile(c, 'Xfile') - exec 'term' cmd 'Xfile' + if has('win32') + term cmd /c type Xfile + else + term cat Xfile + endif let bnr = bufnr('$') call assert_equal('terminal', getbufvar(bnr, '&buftype')) call WaitForAssert({-> assert_equal('finished', term_getstatus(bnr))}) - sleep 50m + sleep 100m call assert_equal(c, getline(1, line('$'))) quit endfor