# HG changeset patch # User Christian Brabandt # Date 1536426905 -7200 # Node ID c833cf17a4b17fc467c4487a75da279b3b6c2f6c # Parent 3acba9455a6300fc3cb6e5bdf4376a0489dfa031 patch 8.1.0354: packadd test fails on MS-Windows commit https://github.com/vim/vim/commit/53c8a478cc4265549597b00214e0da812154742e Author: Bram Moolenaar Date: Sat Sep 8 19:12:12 2018 +0200 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 354, +/**/ 353, /**/ 352,