Mercurial > vim
changeset 12106:d2c20ec4b95a v8.0.0933
patch 8.0.0933: terminal test tries to start GUI when it's not possible
commit https://github.com/vim/vim/commit/9f0139a2a869b0804e5b91a65e3d5952c9091879
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 13 20:26:20 2017 +0200
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 https://github.com/vim/vim/issues/1971)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 13 Aug 2017 20:30:05 +0200 |
parents | 5fb450ed333a |
children | aed6348bdf2e |
files | src/testdir/shared.vim src/testdir/test_gui.vim src/testdir/test_gui_init.vim src/testdir/test_terminal.vim src/version.c |
diffstat | 5 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -215,3 +215,7 @@ func RunVimPiped(before, after, argument endif return 1 endfunc + +func CanRunGui() + return has('gui') && ($DISPLAY != "" || has('gui_running')) +endfunc
--- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -1,6 +1,7 @@ " Tests specifically for the GUI -if !has('gui') || ($DISPLAY == "" && !has('gui_running')) +source shared.vim +if !CanRunGui() finish endif
--- a/src/testdir/test_gui_init.vim +++ b/src/testdir/test_gui_init.vim @@ -1,7 +1,8 @@ " Tests specifically for the GUI features/options that need to be set up at " startup to take effect at runtime. -if !has('gui') || ($DISPLAY == "" && !has('gui_running')) +source shared.vim +if !CanRunGui() finish endif