aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2018-05-30 08:40:40 +0800
committerckelsel <ckelsel@hotmail.com>2018-05-30 08:45:07 +0800
commitbce3e9569153354c95fa84d5072d355271e13ae0 (patch)
tree006bbc203c82d1578a25e7f8edb67c0f4594b54f
parentf711b635133fea2a137b97caa199f68d3142ed4f (diff)
downloadrneovim-bce3e9569153354c95fa84d5072d355271e13ae0.tar.gz
rneovim-bce3e9569153354c95fa84d5072d355271e13ae0.tar.bz2
rneovim-bce3e9569153354c95fa84d5072d355271e13ae0.zip
vim-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. https://github.com/vim/vim/commit/a2845b8f5a3058c8c89699771ffd4d69513b097d
-rw-r--r--src/nvim/testdir/test_quotestar.vim9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_quotestar.vim b/src/nvim/testdir/test_quotestar.vim
index d0dd04f91d..6e4e4caea7 100644
--- a/src/nvim/testdir/test_quotestar.vim
+++ b/src/nvim/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