diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-11-12 21:42:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-11-12 21:42:24 +0100 |
| commit | d3471e578506d5554ab99c4cd08af2a021c4f461 (patch) | |
| tree | 5f6528c8e19af37729888ffc1b7f199914b1bae1 | |
| parent | c2c02574ec76f8d44b948cede9cca38ac91622de (diff) | |
| download | vim-git-8.1.0525.tar.gz | |
patch 8.1.0525: terminal test skips part on Windowsv8.1.0525
Problem: Terminal test skips part on Windows.
Solution: Fix Test_terminal_does_not_truncate_last_newlines(). (Hirohito
Higashi, closes #3606)
| -rw-r--r-- | src/Make_mvc.mak | 5 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 89b1d1624..e281c89a3 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -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 .. ########################################################################### diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 58949a464..70ea3dc94 100644 --- 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_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 diff --git a/src/version.c b/src/version.c index 1edb1d2dd..252d047c6 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 525, +/**/ 524, /**/ 523, |