diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-08 19:12:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-08 19:12:12 +0200 |
| commit | 53c8a478cc4265549597b00214e0da812154742e (patch) | |
| tree | 2d47e8ff90013ac2a58ddb4e83d42a89aa5433dd | |
| parent | 99396d4cbf78d313a454c7448acc07412d2e45b7 (diff) | |
patch 8.1.0354: packadd test fails on MS-Windowsv8.1.0354
Problem: Packadd test fails on MS-Windows.
Solution: Ignore difference between forward and backward slashes.
| -rw-r--r-- | src/testdir/test_packadd.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_packadd.vim b/src/testdir/test_packadd.vim index f511a4d587..6d0565b864 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 840f288773..480d20e8b1 100644 --- 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, |