diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-03-25 15:20:06 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-03-25 15:20:06 +0100 |
commit | a2845b8f5a3058c8c89699771ffd4d69513b097d (patch) | |
tree | 91a7aec225fe0293da00f6f8261c1986c0cff9ab /src | |
parent | 6c0c1e8052811a818739e2f3d543291b7a347ad0 (diff) |
patch 8.0.0507: client-server tests fail when $DISPLAY is not setv8.0.0507
Problem: Client-server tests fail when $DISPLAY is not set.
Solution: Check for E240 before running the test.
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_clientserver.vim | 11 | ||||
-rw-r--r-- | src/testdir/test_quotestar.vim | 9 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 0 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index c98fc026ae..58ced56ce3 100644 --- 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 diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim index d0dd04f91d..6e4e4caea7 100644 --- 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 diff --git a/src/version.c b/src/version.c index e19da86a12..1f82ee1dc8 100644 --- 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, |