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)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 89b1d162492b719d1254cb43978667299d84dcd2..e281c89a363d86f0ec7798577341ac8f960cf9ee 100644 (file)
--- 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 58949a46469ca26c6134e042d5abc5a0432e86ca..70ea3dc94fd8f82b41f7d7935a9c658c31379d0f 100644 (file)
--- 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 1edb1d2dd8f62c46f780c1e10dc4351eacc1e4b9..252d047c68c0f0266ac6b92c47c1c520037bd040 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    525,
 /**/
     524,
 /**/