Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
patch 8.0.1604: paste test may fail if $DISPLAY is not set
Problem:    Paste test may fail if $DISPLAY is not set.
Solution:   Add WorkingClipboard() and use it in the paste test.
  • Loading branch information
brammool committed Mar 13, 2018
1 parent f118d48 commit a903472
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
10 changes: 10 additions & 0 deletions src/testdir/shared.vim
Expand Up @@ -260,6 +260,16 @@ func CanRunGui()
return has('gui') && ($DISPLAY != "" || has('gui_running'))
endfunc

func WorkingClipboard()
if !has('clipboard')
return 0
endif
if has('x11')
return $DISPLAY != ""
endif
return 1
endfunc

" Get line "lnum" as displayed on the screen.
" Trailing white space is trimmed.
func! Screenline(lnum)
Expand Down
4 changes: 3 additions & 1 deletion src/testdir/test_paste.vim
Expand Up @@ -6,6 +6,8 @@ if has('gui_running')
endif
set term=xterm

source shared.vim

func Test_paste_normal_mode()
new
" In first column text is inserted
Expand Down Expand Up @@ -67,7 +69,7 @@ func Test_paste_insert_mode()
endfunc

func Test_paste_clipboard()
if !has('clipboard')
if !WorkingClipboard()
return
endif
let @+ = "nasty\<Esc>:!ls\<CR>command"
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -766,6 +766,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1604,
/**/
1603,
/**/
Expand Down

0 comments on commit a903472

Please sign in to comment.