diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-03 18:21:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-03 18:21:04 +0200 |
| commit | 4515bcdec8f3ba54f9d671cc37b9c9b3e19ea999 (patch) | |
| tree | f4fd49808b7aeeb21c16843e4736983a01ed8ac7 | |
| parent | 7779ee30d912e9dd5bd2371f8b27057bd249d53c (diff) | |
| download | vim-git-4515bcdec8f3ba54f9d671cc37b9c9b3e19ea999.tar.gz | |
patch 8.2.0692: startup test fails on MS-Windowsv8.2.0692
Problem: Startup test fails on MS-Windows.
Solution: Allow for any path.
| -rw-r--r-- | src/testdir/test_startup.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index ff3510ef6..fe93eabc5 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\nline \\d\\+: sourcing \"[\\./]*runtime[\\/]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 abfade87d..f87cc8bda 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 692, +/**/ 691, /**/ 690, |