From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 8 Sep 2018 17:12:12 +0000 (+0200)
Subject: patch 8.1.0354: packadd test fails on MS-Windows
X-Git-Tag: v8.1.0354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53c8a478cc4265549597b00214e0da812154742e;p=vim

patch 8.1.0354: packadd test fails on MS-Windows

Problem:    Packadd test fails on MS-Windows.
Solution:   Ignore difference between forward and backward slashes.
---

diff --git a/src/testdir/test_packadd.vim b/src/testdir/test_packadd.vim
index f511a4d58..6d0565b86 100644
--- a/src/testdir/test_packadd.vim
+++ b/src/testdir/test_packadd.vim
@@ -53,9 +53,10 @@ func Test_packadd()
   call assert_match('/testdir/Xdir/pack/mine/opt/mytest\($\|,\)', &rtp)
 
   let new_after = match(&rtp, '/testdir/Xdir/pack/mine/opt/mytest/after,')
-  let old_after = match(&rtp, ',' . first_after_entry . '\>')
+  let forwarded = substitute(first_after_entry, '\\', '[/\\\\]', 'g')
+  let old_after = match(&rtp, ',' . forwarded . '\>')
   call assert_true(new_after > 0, 'rtp is ' . &rtp)
-  call assert_true(old_after > 0, 'rtp is ' . &rtp)
+  call assert_true(old_after > 0, 'match ' . forwarded . ' in ' . &rtp)
   call assert_true(new_after < old_after, 'rtp is ' . &rtp)
 
   " NOTE: '/.../opt/myte' forwardly matches with '/.../opt/mytest'
diff --git a/src/version.c b/src/version.c
index 840f28877..480d20e8b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    354,
 /**/
     353,
 /**/