Mercurial > vim
changeset 18273:fc68850c5233 v8.1.2131
patch 8.1.2131: MSVC tests fail
Commit: https://github.com/vim/vim/commit/c25e702deec74771e49f6c2df4cda7a1f97d0c1e
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 10 14:08:26 2019 +0200
patch 8.1.2131: MSVC tests fail
Problem: MSVC tests fail.
Solution: Replace backslashes with slashes.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 10 Oct 2019 14:15:04 +0200 |
| parents | 88a6aab44084 |
| children | f4cec6d77c86 |
| files | src/testdir/test_compiler.vim src/testdir/test_spell.vim src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- 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:')