aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-08 06:04:08 -04:00
Code Activity

patch 8.1.1297: invalid argument test fails without GTK

Browse Source 
Problem:    Invalid argument test fails without GTK.
Solution:   Test -display and --display separately.
This commit is contained in:
Bram Moolenaar
2019-05-08 17:58:15 +02:00
parent 27821260c0
commit 240f7abab0
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/testdir/test_startup.vim
View File

@@ -422,7 +422,7 @@ func Test_invalid_args()
endfor endfor
endif endif
if has('clipboard') if has('gui_gtk')
let out = split(system(GetVimCommand() .. ' --display'), "\n") let out = split(system(GetVimCommand() .. ' --display'), "\n")
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])
@@ -430,6 +430,14 @@ func Test_invalid_args()
call assert_equal('More info with: "vim -h"', out[2]) call assert_equal('More info with: "vim -h"', out[2])
endif endif
if has('clipboard')
let out = split(system(GetVimCommand() .. ' -display'), "\n")
call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])
call assert_equal('Argument missing after: "-display"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
endif
let out = split(system(GetVimCommand() .. ' -ix'), "\n") let out = split(system(GetVimCommand() .. ' -ix'), "\n")
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1297,
/**/ /**/
1296, 1296,
/**/ /**/