0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

patch 8.1.2131: MSVC tests fail

Problem:    MSVC tests fail.
Solution:   Replace backslashes with slashes.
This commit is contained in:
Bram Moolenaar
2019-10-10 14:08:26 +02:00
parent 073e779640
commit c25e702dee
3 changed files with 13 additions and 9 deletions

View File

@@ -38,10 +38,11 @@ func Test_compiler()
endfunc endfunc
func Test_compiler_without_arg() func Test_compiler_without_arg()
let a=split(execute('compiler')) let runtime = substitute($VIMRUNTIME, '\\', '/', 'g')
call assert_match($VIMRUNTIME .. '/compiler/ant.vim$', a[0]) let a = split(execute('compiler'))
call assert_match($VIMRUNTIME .. '/compiler/bcc.vim$', a[1]) call assert_match(runtime .. '/compiler/ant.vim$', a[0])
call assert_match($VIMRUNTIME .. '/compiler/xmlwf.vim$', a[-1]) call assert_match(runtime .. '/compiler/bcc.vim$', a[1])
call assert_match(runtime .. '/compiler/xmlwf.vim$', a[-1])
endfunc endfunc
func Test_compiler_completion() func Test_compiler_completion()

View File

@@ -128,20 +128,21 @@ endfunc
func Test_spellinfo() func Test_spellinfo()
new new
let runtime = substitute($VIMRUNTIME, '\\', '/', 'g')
set enc=latin1 spell spelllang=en 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 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 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 set enc=latin1 spell spelllang=en_us,en_nz
call assert_match("^\n" . call assert_match("^\n" .
\ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" . \ "file: " .. runtime .. "/spell/en.latin1.spl\n" .
\ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) \ "file: " .. runtime.. "/spell/en.latin1.spl\n$", execute('spellinfo'))
set spell spelllang= set spell spelllang=
call assert_fails('spellinfo', 'E756:') call assert_fails('spellinfo', 'E756:')

View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2131,
/**/ /**/
2130, 2130,
/**/ /**/