patch 9.1.1492: tests: failure when Wayland compositor fails to start

Problem:  tests: failure when Wayland compositor fails to start
Solution: instead of throwing an error causing a failure, throw
          "Skipped", so that the Vim test suite continues and does not
          fail

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

diff --git a/src/testdir/window_manager.vim b/src/testdir/window_manager.vim
index 39e643eab7e52cf6b9ca9a3f8ab27cc01a518991..36fe34058367c61a997c642c02c43190d1f8026a 100644 (file)
--- a/src/testdir/window_manager.vim
+++ b/src/testdir/window_manager.vim
@@ -42,7 +42,7 @@ endfunc
 
 func s:StartCompositorExit(job, status)
     if s:wayland_display_name == ""
-      throw "Error: Wayland compositor exited when starting up"
+      throw "Skipped: Error: Wayland compositor exited when starting up"
     endif
 endfunc
 

diff --git a/src/version.c b/src/version.c
index 42a3450329b0c5d0f1b2d3d6223b3063ff699199..e19d10ab86ca841c6d9f753105b417630746b92f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1492,
 /**/
     1491,
 /**/