Patch 8.1.2016
Problem: Terminal altscreen test now fails on MS-Windows.
Solution: Skip the test on MS-Windows
Files: src/testdir/test_terminal.vim
*** ../vim-8.1.2015/src/testdir/test_terminal.vim 2019-09-08
22:35:44.780422666 +0200
--- src/testdir/test_terminal.vim 2019-09-08 22:55:44.128376484 +0200
***************
*** 321,330 ****
endfunc
func Test_terminal_postponed_scrollback()
! if !has('unix')
! " tail -f only works on Unix
! return
! endif
call writefile(range(50), 'Xtext')
call writefile([
--- 321,328 ----
endfunc
func Test_terminal_postponed_scrollback()
! " tail -f only works on Unix
! CheckUnix
call writefile(range(50), 'Xtext')
call writefile([
***************
*** 740,748 ****
func Test_terminal_special_chars()
" this file name only works on Unix
! if !has('unix')
! return
! endif
call mkdir('Xdir with spaces')
call writefile(['x'], 'Xdir with spaces/quoted"file')
term ls Xdir\ with\ spaces/quoted\"file
--- 738,745 ----
func Test_terminal_special_chars()
" this file name only works on Unix
! CheckUnix
!
call mkdir('Xdir with spaces')
call writefile(['x'], 'Xdir with spaces/quoted"file')
term ls Xdir\ with\ spaces/quoted\"file
***************
*** 953,961 ****
endfunc
func Test_terminal_response_to_control_sequence()
! if !has('unix')
! return
! endif
let buf = Run_shell_in_terminal({})
call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
--- 950,956 ----
endfunc
func Test_terminal_response_to_control_sequence()
! CheckUnix
let buf = Run_shell_in_terminal({})
call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
***************
*** 1720,1728 ****
endfunc
func Test_terminal_out_err()
! if !has('unix')
! return
! endif
call writefile([
\ '#!/bin/sh',
\ 'echo "this is standard error" >&2',
--- 1715,1722 ----
endfunc
func Test_terminal_out_err()
! CheckUnix
!
call writefile([
\ '#!/bin/sh',
\ 'echo "this is standard error" >&2',
***************
*** 1744,1752 ****
endfunc
func Test_terminwinscroll()
! if !has('unix')
! return
! endif
" Let the terminal output more than 'termwinscroll' lines, some at the start
" will be dropped.
--- 1738,1744 ----
endfunc
func Test_terminwinscroll()
! CheckUnix
" Let the terminal output more than 'termwinscroll' lines, some at the start
" will be dropped.
***************
*** 1848,1856 ****
endfunc
func Test_terminal_hidden()
! if !has('unix')
! return
! endif
term ++hidden cat
let bnr = bufnr('$')
call assert_equal('terminal', getbufvar(bnr, '&buftype'))
--- 1840,1847 ----
endfunc
func Test_terminal_hidden()
! CheckUnix
!
term ++hidden cat
let bnr = bufnr('$')
call assert_equal('terminal', getbufvar(bnr, '&buftype'))
***************
*** 1887,1895 ****
endfunc
func Test_terminal_hidden_and_close()
! if !has('unix')
! return
! endif
call assert_equal(1, winnr('$'))
term ++hidden ++close ls
let bnr = bufnr('$')
--- 1878,1885 ----
endfunc
func Test_terminal_hidden_and_close()
! CheckUnix
!
call assert_equal(1, winnr('$'))
term ++hidden ++close ls
let bnr = bufnr('$')
***************
*** 1933,1941 ****
endfunc
func Test_term_getcursor()
! if !has('unix')
! return
! endif
let buf = Run_shell_in_terminal({})
" Wait for the shell to display a prompt.
--- 1923,1930 ----
endfunc
func Test_term_getcursor()
! CheckUnix
!
let buf = Run_shell_in_terminal({})
" Wait for the shell to display a prompt.
***************
*** 2024,2032 ****
" 4. 0.5 sec later: redraw, including statusline (used to trigger bug)
" 4. 0.5 sec later: should be done, clean up
func Test_terminal_statusline()
! if !has('unix')
! return
! endif
set statusline=x
terminal
let tbuf = bufnr('')
--- 2013,2020 ----
" 4. 0.5 sec later: redraw, including statusline (used to trigger bug)
" 4. 0.5 sec later: should be done, clean up
func Test_terminal_statusline()
! CheckUnix
!
set statusline=x
terminal
let tbuf = bufnr('')
***************
*** 2088,2098 ****
endfunc
func Test_terminal_altscreen()
! if has('win32')
! let cmd = "type Xtext\<CR>"
! else
! let cmd = "cat Xtext\<CR>"
! endif
let buf = term_start(&shell, {})
call writefile(["\<Esc>[?1047h"], 'Xtext')
--- 2076,2084 ----
endfunc
func Test_terminal_altscreen()
! " somehow doesn't work on MS-Windows
! CheckUnix
! let cmd = "cat Xtext\<CR>"
let buf = term_start(&shell, {})
call writefile(["\<Esc>[?1047h"], 'Xtext')
*** ../vim-8.1.2015/src/version.c 2019-09-08 22:35:44.780422666 +0200
--- src/version.c 2019-09-08 22:56:20.564257323 +0200
***************
*** 759,760 ****
--- 759,762 ----
{ /* Add new patch number below this line */
+ /**/
+ 2016,
/**/
--
hundred-and-one symptoms of being an internet addict:
226. You sit down at the computer right after dinner and your spouse
says "See you in the morning."
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/201909082057.x88Kvibe022099%40masaka.moolenaar.net.
