From: Bram Moolenaar Date: Sun, 3 May 2020 15:55:32 +0000 (+0200) Subject: patch 8.2.0691: startup test fails X-Git-Tag: v8.2.0691 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7779ee30d912e9dd5bd2371f8b27057bd249d53c;p=vim patch 8.2.0691: startup test fails Problem: Startup test fails. Solution: Adjust expected output from -V2 argument. --- diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 5eff1bdf3..ff3510ef6 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -274,7 +274,7 @@ func Test_V_arg() call assert_equal(" verbose=0\n", out) let out = system(GetVimCommand() . ' --clean -es -X -V2 -c "set verbose?" -cq') - call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nSearching for \"filetype\.vim\".*\n", out) + call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline \\d\\+: sourcing \"[\\./]*runtime[\\/]filetype\.vim\".*\n", out) call assert_match(" verbose=2\n", out) let out = system(GetVimCommand() . ' --clean -es -X -V15 -c "set verbose?" -cq') diff --git a/src/version.c b/src/version.c index 6dc86b964..abfade87d 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 691, /**/ 690, /**/