diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-12 15:04:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-12 15:04:56 -0400 |
| commit | 4d3ef578e91cb23586979ed50fa0dfddd45ded1d (patch) | |
| tree | 5caff2747aa15f9642d2a59bcb34fb0c108f9ac8 /src | |
| parent | 397be5d3805baf3df4e43c0b506986651b54dcbc (diff) | |
| parent | 20b745b45b045a1a6e22f86f87483bdf1504e9c8 (diff) | |
| download | rneovim-4d3ef578e91cb23586979ed50fa0dfddd45ded1d.tar.gz rneovim-4d3ef578e91cb23586979ed50fa0dfddd45ded1d.tar.bz2 rneovim-4d3ef578e91cb23586979ed50fa0dfddd45ded1d.zip | |
Merge pull request #12883 from janlazo/vim-8.2.1640
vim-patch:8.1.{1296,1297,1298},8.2.{1640,1645,1646,1648,1649,1654,1655,1661}
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_startup.vim | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/nvim/testdir/test_startup.vim b/src/nvim/testdir/test_startup.vim index 9abaca5957..12bec745a8 100644 --- a/src/nvim/testdir/test_startup.vim +++ b/src/nvim/testdir/test_startup.vim @@ -369,12 +369,11 @@ func Test_invalid_args() endfor if has('clientserver') - " FIXME: need to add --servername to this list - " but it causes vim-8.1.1282 to crash! for opt in ['--remote', '--remote-send', '--remote-silent', '--remote-expr', \ '--remote-tab', '--remote-tab-wait', \ '--remote-tab-wait-silent', '--remote-tab-silent', \ '--remote-wait', '--remote-wait-silent', + \ '--servername', \ ] let out = split(system(GetVimCommand() .. ' ' .. opt), "\n") call assert_equal(1, v:shell_error) @@ -384,14 +383,21 @@ func Test_invalid_args() endfor endif - " FIXME: commented out as this causes vim-8.1.1282 to crash! - "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 + 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]) + call assert_equal('Argument missing after: "--display"', out[1]) + call assert_equal('More info with: "vim -h"', out[2]) + endif + + if has('xterm_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) |