diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-09 22:46:28 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-11 18:23:47 -0400 |
commit | 2ab6ec9e480741d37e31febf86f6272612f079f3 (patch) | |
tree | 16580375a984ae077069f49b1efe9639344a0438 /src | |
parent | 978dd99f453c8430da4416f1fd5ca7af91b56240 (diff) | |
download | rneovim-2ab6ec9e480741d37e31febf86f6272612f079f3.tar.gz rneovim-2ab6ec9e480741d37e31febf86f6272612f079f3.tar.bz2 rneovim-2ab6ec9e480741d37e31febf86f6272612f079f3.zip |
vim-patch:8.1.1297: invalid argument test fails without GTK
Problem: Invalid argument test fails without GTK.
Solution: Test -display and --display separately.
https://github.com/vim/vim/commit/240f7abab01b5e3fd5336dd780e42501ec3f2fcb
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/testdir/test_startup.vim | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_startup.vim b/src/nvim/testdir/test_startup.vim index b460798c5f..0b0cfb7a5c 100644 --- a/src/nvim/testdir/test_startup.vim +++ b/src/nvim/testdir/test_startup.vim @@ -383,7 +383,7 @@ func Test_invalid_args() endfor endif - if has('clipboard') + if has('gui_gtk') let out = split(system(GetVimCommand() .. ' --display'), "\n") call assert_equal(1, v:shell_error) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) @@ -391,6 +391,14 @@ func Test_invalid_args() call assert_equal('More info with: "vim -h"', out[2]) 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") call assert_equal(1, v:shell_error) call assert_equal('nvim: Garbage after option argument: "-ix"', out[0]) |