From 47a545667006ded57dc9660333e4ea2cab23b679 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 13 Jun 2019 00:29:10 -0400 Subject: vim-patch:8.0.0933: terminal test tries to start GUI when it's not possible Problem: Terminal test tries to start GUI when it's not possible. Solution: Check if the GUI can run. (James McCoy, closes vim/vim#1971) https://github.com/vim/vim/commit/9f0139a2a869b0804e5b91a65e3d5952c9091879 --- src/nvim/testdir/shared.vim | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim index eb6798f353..29af05fe3f 100644 --- a/src/nvim/testdir/shared.vim +++ b/src/nvim/testdir/shared.vim @@ -246,3 +246,7 @@ func! Screenline(lnum) let line = join(chars, '') return matchstr(line, '^.\{-}\ze\s*$') endfunc + +func CanRunGui() + return has('gui') && ($DISPLAY != "" || has('gui_running')) +endfunc -- cgit From 6efa3bff09afb0e54ad71278ac60259bf41be286 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 13 Jun 2019 19:39:32 -0400 Subject: test/old: pass Test_statusline on Windows --- src/nvim/testdir/test_statusline.vim | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/test_statusline.vim b/src/nvim/testdir/test_statusline.vim index b86340a23a..ea29da0262 100644 --- a/src/nvim/testdir/test_statusline.vim +++ b/src/nvim/testdir/test_statusline.vim @@ -86,8 +86,11 @@ func Test_statusline() call assert_match('^Xstatusline\s*$', s:get_statusline()) " %F: Full path to the file in the buffer. + let shellslash = &shellslash + set shellslash set statusline=%F call assert_match('/testdir/Xstatusline\s*$', s:get_statusline()) + let &shellslash = shellslash " %h: Help buffer flag, text is "[help]". " %H: Help buffer flag, text is ",HLP". -- cgit