Mercurial > vim
changeset 11250:ca5550f66b27 v8.0.0511
patch 8.0.0511: message for skipping client-server tests is unclear
commit https://github.com/vim/vim/commit/a683ec44c34f0717dcc6a0c03493ba39b879ac38
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 25 20:14:34 2017 +0100
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 25 Mar 2017 20:15:04 +0100 |
| parents | 6d762dc2a79c |
| children | 0a7babcaadc8 |
| files | src/testdir/test_clientserver.vim src/testdir/test_quotestar.vim src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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