patch 8.0.0511: message for skipping client-server tests is unclear

Problem:    Menuage for skipping client-server tests is unclear.
Solution:   Be more specific about what's missing (Hirohito Higashi, Kazunobu
            Kuriyama)

diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 58ced56ce3115d88d5b4f041537191b84faba0cf..86dad54d7031119f73b4144d649d661985457255 100644 (file)
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -11,13 +11,15 @@ func Test_client_server()
   if cmd == ''
     return
   endif
-  if has('unix')
+  if has('x11')
+    if empty($DISPLAY)
+      throw 'Skipped: $DISPLAY is not set'
+    endif
     try
       call remote_send('xxx', '')
     catch
       if v:exception =~ 'E240:'
-       " No connection to the X server, give up.
-       return
+       throw 'Skipped: no connection to the X server'
       endif
       " ignore other errors
     endtry

diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index 6e4e4caea7707bf1a116661d7f2ab3a968c4f961..37e3a10ed17eddd6186760a6380ff304a00f72bd 100644 (file)
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -118,8 +118,12 @@ func Test_quotestar()
 
   if has('macunix')
     let skipped = Do_test_quotestar_for_macunix()
-  elseif !empty("$DISPLAY")
-    let skipped = Do_test_quotestar_for_x11()
+  elseif has('x11')
+    if empty($DISPLAY)
+      let skipped = "Test can only run when $DISPLAY is set."
+    else
+      let skipped = Do_test_quotestar_for_x11()
+    endif
   else
     let skipped = "Test is not implemented yet for this platform."
   endif

diff --git a/src/version.c b/src/version.c
index 08adb69948a1c67be8337adc8ef16ba7938f649a..7d2cf27584f6a0b5115285a9bdbb709c1a8dc9f5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    511,
 /**/
     510,
 /**/