From: Bram Moolenaar Date: Fri, 28 Dec 2018 17:32:56 +0000 (+0100) Subject: patch 8.1.0650: command line argument -q [errorfile] is not tested X-Git-Tag: v8.1.0650 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54948183d210f5117271bb5710752da24054fade;p=vim patch 8.1.0650: command line argument -q [errorfile] is not tested Problem: Command line argument -q [errorfile] is not tested. Solution: Add a test. (Dominique Pelle, closes #3730) --- diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 6f06ab877..16b202f85 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -269,6 +269,53 @@ func Test_V_arg() call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline 1: \" The default vimrc file\..* verbose=15\n", out) endfunc +" Test the '-q [errorfile]' argument. +func Test_q_arg() + let source_file = has('win32') ? '..\memfile.c' : '../memfile.c' + let after = [ + \ 'call writefile([&errorfile, string(getpos("."))], "Xtestout")', + \ 'copen', + \ 'w >> Xtestout', + \ 'qall' + \ ] + + " Test with default argument '-q'. + call assert_equal('errors.err', &errorfile) + call writefile(["../memfile.c:1482:5: error: expected ';' before '}' token"], 'errors.err') + if RunVim([], after, '-q') + let lines = readfile('Xtestout') + call assert_equal(['errors.err', + \ '[0, 1482, 5, 0]', + \ source_file . "|1482 col 5| error: expected ';' before '}' token"], + \ lines) + endif + call delete('Xtestout') + call delete('errors.err') + + " Test with explicit argument '-q Xerrors' (with space). + call writefile(["../memfile.c:1482:5: error: expected ';' before '}' token"], 'Xerrors') + if RunVim([], after, '-q Xerrors') + let lines = readfile('Xtestout') + call assert_equal(['Xerrors', + \ '[0, 1482, 5, 0]', + \ source_file . "|1482 col 5| error: expected ';' before '}' token"], + \ lines) + endif + call delete('Xtestout') + + " Test with explicit argument '-qXerrors' (without space). + if RunVim([], after, '-qXerrors') + let lines = readfile('Xtestout') + call assert_equal(['Xerrors', + \ '[0, 1482, 5, 0]', + \ source_file . "|1482 col 5| error: expected ';' before '}' token"], + \ lines) + endif + + call delete('Xtestout') + call delete('Xerrors') +endfunc + " Test the -V[N]{filename} argument to set the 'verbose' option to N " and set 'verbosefile' to filename. func Test_V_file_arg() diff --git a/src/version.c b/src/version.c index 870ea896d..cbb0e70ea 100644 --- a/src/version.c +++ b/src/version.c @@ -799,6 +799,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 650, /**/ 649, /**/