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 #1971)
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 790b07b..a305c90 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -215,3 +215,7 @@
endif
return 1
endfunc
+
+func CanRunGui()
+ return has('gui') && ($DISPLAY != "" || has('gui_running'))
+endfunc
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index f044f3a..427bab7 100644
--- 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
diff --git a/src/testdir/test_gui_init.vim b/src/testdir/test_gui_init.vim
index 21e5bb6..661bf0c 100644
--- 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
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 4278351..605292e 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -417,7 +417,7 @@
" must be last, we can't go back from GUI to terminal
func Test_zz_terminal_in_gui()
- if !has('gui')
+ if !CanRunGui()
return
endif
gui -f
diff --git a/src/version.c b/src/version.c
index 850be59..ab8c314 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 933,
+/**/
932,
/**/
931,