Mercurial > vim

changeset 11242:9612b93820a4 v8.0.0507

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0507: client-server tests fail when $DISPLAY is not set commit https://github.com/vim/vim/commit/a2845b8f5a3058c8c89699771ffd4d69513b097d Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 25 15:20:06 2017 +0100 patch 8.0.0507: client-server tests fail when $DISPLAY is not set Problem: Client-server tests fail when $DISPLAY is not set. Solution: Check for E240 before running the test.
author Christian Brabandt <cb@256bit.org>
date Sat, 25 Mar 2017 15:30:04 +0100
parents 5eda6979da94
children 56ad74ce1a3a
files src/testdir/test_clientserver.vim src/testdir/test_quotestar.vim src/version.c
diffstat 3 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -11,6 +11,17 @@ func Test_client_server()
   if cmd == ''
     return
   endif
+  if has('unix')
+    try
+      call remote_send('xxx', '')
+    catch
+      if v:exception =~ 'E240:'
+	" No connection to the X server, give up.
+	return
+      endif
+      " ignore other errors
+    endtry
+  endif
 
   let name = 'XVIMTEST'
   let cmd .= ' --servername ' . name
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -39,6 +39,15 @@ func Do_test_quotestar_for_x11()
   if cmd == ''
     return 'GetVimCommand() failed'
   endif
+  try
+    call remote_send('xxx', '')
+  catch
+    if v:exception =~ 'E240:'
+      " No connection to the X server, give up.
+      return
+    endif
+    " ignore other errors
+  endtry
 
   let name = 'XVIMCLIPBOARD'
   let cmd .= ' --servername ' . name
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    507,
+/**/
     506,
 /**/
     505,