diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-05-30 09:35:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 09:35:07 +0200 |
| commit | 3585df3f0b1ad748c2fbab1d101500e7177aad36 (patch) | |
| tree | 4f08121d8f007ac6ff262a67f014533d6c67e3aa | |
| parent | 77a2eaf08bdc29f5ae6f4dc263b2a97b6cb749e8 (diff) | |
| parent | 6a0c727a0bf8c7812ca39e60caa55b8836df2919 (diff) | |
| download | rneovim-3585df3f0b1ad748c2fbab1d101500e7177aad36.tar.gz rneovim-3585df3f0b1ad748c2fbab1d101500e7177aad36.tar.bz2 rneovim-3585df3f0b1ad748c2fbab1d101500e7177aad36.zip | |
Merge #8451 from ckelsel/vim-8.0.0507
| -rw-r--r-- | src/nvim/testdir/test_quotestar.vim | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_quotestar.vim b/src/nvim/testdir/test_quotestar.vim index d0dd04f91d..37e3a10ed1 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 @@ -109,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 |