Skip to content

Commit a683ec4

Browse files
committed
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)
1 parent 8a0141d commit a683ec4

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

src/testdir/test_clientserver.vim

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ func Test_client_server()
1111
if cmd == ''
1212
return
1313
endif
14-
if has('unix')
14+
if has('x11')
15+
if empty($DISPLAY)
16+
throw 'Skipped: $DISPLAY is not set'
17+
endif
1518
try
1619
call remote_send('xxx', '')
1720
catch
1821
if v:exception =~ 'E240:'
19-
" No connection to the X server, give up.
20-
return
22+
throw 'Skipped: no connection to the X server'
2123
endif
2224
" ignore other errors
2325
endtry

src/testdir/test_quotestar.vim

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,12 @@ func Test_quotestar()
118118

119119
if has('macunix')
120120
let skipped = Do_test_quotestar_for_macunix()
121-
elseif !empty("$DISPLAY")
122-
let skipped = Do_test_quotestar_for_x11()
121+
elseif has('x11')
122+
if empty($DISPLAY)
123+
let skipped = "Test can only run when $DISPLAY is set."
124+
else
125+
let skipped = Do_test_quotestar_for_x11()
126+
endif
123127
else
124128
let skipped = "Test is not implemented yet for this platform."
125129
endif

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
511,
767769
/**/
768770
510,
769771
/**/

0 commit comments

Comments
 (0)