patch 8.1.2131: MSVC tests fail

Problem:    MSVC tests fail.
Solution:   Replace backslashes with slashes.

diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim
index 06522d77ecaa1e79db57be99dcdfd73e5e38a131..6bb602717febfd3513f82b849624ffbad3d3c04c 100644 (file)
--- 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 523126652dabfd1a64907f289386918a47907a0c..9cbfaa50e89c3d46bfe7aafe384fb4e8f8b2fbd4 100644 (file)
--- 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 a0646485c22a3940fbad33c58ebb7b242ab1b21c..2dc9f9bf1ef074db555c2c087781ae4a6d7d97aa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2131,
 /**/
     2130,
 /**/