diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-10 14:08:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-10 14:08:26 +0200 |
| commit | c25e702deec74771e49f6c2df4cda7a1f97d0c1e (patch) | |
| tree | 673153202668037b4c0ffc65ac7e143f276d9a7c | |
| parent | 073e779640d089445c7289393db94d1ceb4ddb17 (diff) | |
patch 8.1.2131: MSVC tests failv8.1.2131
Problem: MSVC tests fail.
Solution: Replace backslashes with slashes.
| -rw-r--r-- | src/testdir/test_compiler.vim | 9 | ||||
| -rw-r--r-- | src/testdir/test_spell.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim index 06522d77ec..6bb602717f 100644 --- a/src/testdir/test_compiler.vim +++ b/src/testdir/test_compiler.vim @@ -38,10 +38,11 @@ func Test_compiler() endfunc func Test_compiler_without_arg() - let a=split(execute('compiler')) - call assert_match($VIMRUNTIME .. '/compiler/ant.vim$', a[0]) - call assert_match($VIMRUNTIME .. '/compiler/bcc.vim$', a[1]) - call assert_match($VIMRUNTIME .. '/compiler/xmlwf.vim$', a[-1]) + let runtime = substitute($VIMRUNTIME, '\\', '/', 'g') + let a = split(execute('compiler')) + call assert_match(runtime .. '/compiler/ant.vim$', a[0]) + call assert_match(runtime .. '/compiler/bcc.vim$', a[1]) + call assert_match(runtime .. '/compiler/xmlwf.vim$', a[-1]) endfunc func Test_compiler_completion() diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim index 523126652d..9cbfaa50e8 100644 --- a/src/testdir/test_spell.vim +++ b/src/testdir/test_spell.vim @@ -128,20 +128,21 @@ endfunc func Test_spellinfo() new + let runtime = substitute($VIMRUNTIME, '\\', '/', 'g') set enc=latin1 spell spelllang=en - call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. runtime .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set enc=cp1250 spell spelllang=en - call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.ascii.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. runtime .. "/spell/en.ascii.spl\n$", execute('spellinfo')) set enc=utf-8 spell spelllang=en - call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.utf-8.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. runtime .. "/spell/en.utf-8.spl\n$", execute('spellinfo')) set enc=latin1 spell spelllang=en_us,en_nz call assert_match("^\n" . - \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" . - \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) + \ "file: " .. runtime .. "/spell/en.latin1.spl\n" . + \ "file: " .. runtime.. "/spell/en.latin1.spl\n$", execute('spellinfo')) set spell spelllang= call assert_fails('spellinfo', 'E756:') diff --git a/src/version.c b/src/version.c index a0646485c2..2dc9f9bf1e 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2131, +/**/ 2130, /**/ 2129, |