diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-25 20:14:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-25 20:14:34 +0100 |
| commit | a683ec44c34f0717dcc6a0c03493ba39b879ac38 (patch) | |
| tree | 8cf302c50d2c326bf61cb6553786269a2281ce47 /src | |
| parent | 8a0141d4e7054587281d3bfd09480376b1fc719f (diff) | |
patch 8.0.0511: message for skipping client-server tests is unclearv8.0.0511
Problem: Menuage for skipping client-server tests is unclear.
Solution: Be more specific about what's missing (Hirohito Higashi, Kazunobu
Kuriyama)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_clientserver.vim | 8 | ||||
| -rw-r--r-- | src/testdir/test_quotestar.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index 58ced56ce3..86dad54d70 100644 --- 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 diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim index 6e4e4caea7..37e3a10ed1 100644 --- 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 diff --git a/src/version.c b/src/version.c index 08adb69948..7d2cf27584 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 */ /**/ + 511, +/**/ 510, /**/ 509, |