mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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)
This commit is contained in:
@@ -1269,7 +1269,8 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
|
||||
|
||||
|
||||
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 @@ $(NEW_TESTS):
|
||||
$(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 ..
|
||||
|
||||
###########################################################################
|
||||
|
@@ -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_last_newlines()
|
||||
|
||||
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
|
||||
|
@@ -792,6 +792,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
525,
|
||||
/**/
|
||||
524,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user