diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-21 22:36:45 -0500 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-21 22:45:39 -0500 |
commit | e632e30b8a6c65ebe30849f6f2fe09c7630ed303 (patch) | |
tree | 9799cf848399f78d2a5ad01d0d5cfa7d97f0203b /src | |
parent | c4cef4ec93e3a6c9b9842239ae80cf90e528d559 (diff) | |
download | rneovim-e632e30b8a6c65ebe30849f6f2fe09c7630ed303.tar.gz rneovim-e632e30b8a6c65ebe30849f6f2fe09c7630ed303.tar.bz2 rneovim-e632e30b8a6c65ebe30849f6f2fe09c7630ed303.zip |
test/old: cherry-pick patch 8.1.2373 for test_startup.vim
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/testdir/test_startup.vim | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/nvim/testdir/test_startup.vim b/src/nvim/testdir/test_startup.vim index ec043a3188..1a90c8d62f 100644 --- a/src/nvim/testdir/test_startup.vim +++ b/src/nvim/testdir/test_startup.vim @@ -2,6 +2,7 @@ source shared.vim source screendump.vim +source check.vim " Check that loading startup.vim works. func Test_startup_script() @@ -280,6 +281,8 @@ endfunc " Test the '-q [errorfile]' argument. func Test_q_arg() + CheckFeature quickfix + let source_file = has('win32') ? '..\memfile.c' : '../memfile.c' let after = [ \ 'call writefile([&errorfile, string(getpos("."))], "Xtestout")', @@ -455,13 +458,15 @@ func Test_invalid_args() let out = split(system(GetVimCommand() .. ' - xxx -cq'), "\n") call assert_equal(0, v:shell_error) - " Detect invalid repeated arguments '-t foo -t foo", '-q foo -q foo'. - for opt in ['-t', '-q'] - let out = split(system(GetVimCommand() .. repeat(' ' .. opt .. ' foo', 2)), "\n") - call assert_equal(1, v:shell_error) - call assert_equal('nvim: Too many edit arguments: "' .. opt .. '"', out[0]) - call assert_equal('More info with "nvim -h"', out[1]) - endfor + if has('quickfix') + " Detect invalid repeated arguments '-t foo -t foo", '-q foo -q foo'. + for opt in ['-t', '-q'] + let out = split(system(GetVimCommand() .. repeat(' ' .. opt .. ' foo', 2)), "\n") + call assert_equal(1, v:shell_error) + call assert_equal('nvim: Too many edit arguments: "' .. opt .. '"', out[0]) + call assert_equal('More info with "nvim -h"', out[1]) + endfor + endif for opt in [' -cq', ' --cmd q', ' +', ' -S foo'] let out = split(system(GetVimCommand() .. repeat(opt, 11)), "\n") |