0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -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:
Bram Moolenaar
2018-11-12 21:42:24 +01:00
parent c2c02574ec
commit d3471e5785
3 changed files with 11 additions and 10 deletions

View File

@@ -1269,7 +1269,8 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
tags: notags 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: notags:
- if exist tags del tags - if exist tags del tags
@@ -1323,7 +1324,7 @@ $(NEW_TESTS):
$(MAKE) /NOLOGO -f Make_dos.mak nolog $(MAKE) /NOLOGO -f Make_dos.mak nolog
$(MAKE) /NOLOGO -f Make_dos.mak $@.res $(MAKE) /NOLOGO -f Make_dos.mak $@.res
$(MAKE) /NOLOGO -f Make_dos.mak report $(MAKE) /NOLOGO -f Make_dos.mak report
cat messages type messages
cd .. cd ..
########################################################################### ###########################################################################

View File

@@ -1660,12 +1660,6 @@ func Test_terminal_hidden_and_close()
endfunc endfunc
func Test_terminal_does_not_truncate_last_newlines() 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 = [ let contents = [
\ [ 'One', '', 'X' ], \ [ 'One', '', 'X' ],
\ [ 'Two', '', '' ], \ [ 'Two', '', '' ],
@@ -1674,11 +1668,15 @@ func Test_terminal_does_not_truncate_last_newlines()
for c in contents for c in contents
call writefile(c, 'Xfile') call writefile(c, 'Xfile')
exec 'term' cmd 'Xfile' if has('win32')
term cmd /c type Xfile
else
term cat Xfile
endif
let bnr = bufnr('$') let bnr = bufnr('$')
call assert_equal('terminal', getbufvar(bnr, '&buftype')) call assert_equal('terminal', getbufvar(bnr, '&buftype'))
call WaitForAssert({-> assert_equal('finished', term_getstatus(bnr))}) call WaitForAssert({-> assert_equal('finished', term_getstatus(bnr))})
sleep 50m sleep 100m
call assert_equal(c, getline(1, line('$'))) call assert_equal(c, getline(1, line('$')))
quit quit
endfor endfor

View File

@@ -792,6 +792,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 */
/**/
525,
/**/ /**/
524, 524,
/**/ /**/