patch 9.2.0117: tests: test_wayland.vim fails

Problem:  tests: test_wayland.vim fails when X11 is not available or
          $XDG_RUNTIME_DIR is not defined
Solution: Skip test_wayland when prerequisites are not fulfilled

closes: #19579

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_wayland.vim b/src/testdir/test_wayland.vim
index 5b801c9a4414647340ba78e3b7f475f28404ded1..c690d0cfe9b7e4663078971e0da72fd8cca05d8a 100644 (file)
--- a/src/testdir/test_wayland.vim
+++ b/src/testdir/test_wayland.vim
@@ -6,6 +6,7 @@ CheckUnix
 CheckFeature job
 CheckWaylandCompositor
 CheckNotGui
+CheckEnv XDG_RUNTIME_DIR
 
 if !executable('wl-paste') || !executable('wl-copy')
   throw "Skipped: wl-clipboard is not available"
@@ -58,6 +59,10 @@ endfunc
 func s:CheckClientserver()
   CheckFeature clientserver
 
+  if has('x11')
+      CheckEnv DISPLAY
+  endif
+
   if has('socketserver') && !has('x11')
     if v:servername == ""
       call remote_startserver('VIMSOCKETSERVER')

diff --git a/src/version.c b/src/version.c
index d0c530a1875dd5020bfb0e2150533493a3421011..7524fcd9659a83b341e481b58f08386b05031d8c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    117,
 /**/
     116,
 /**/