changeset 20869:738e182aaf29 v8.2.0986

patch 8.2.0986: MS-Windows: functions test fails Commit: https://github.com/vim/vim/commit/c70222d12a2f8552273c0de48a3bf7138d649175 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jun 15 23:18:12 2020 +0200 patch 8.2.0986: MS-Windows: functions test fails Problem: MS-Windows: functions test fails. Solution: Only simplify ///path on Unix.
author Bram Moolenaar <Bram@vim.org>
date Mon, 15 Jun 2020 23:30:03 +0200
parents 4681dae9259a
children 6203fd2cfb51
files src/testdir/test_functions.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -464,8 +464,10 @@ func Test_simplify()
   call assert_equal('/',           simplify('/..'))
   call assert_equal('/...',        simplify('/...'))
   call assert_equal('//path',      simplify('//path'))
-  call assert_equal('/path',       simplify('///path'))
-  call assert_equal('/path',       simplify('////path'))
+  if has('unix')
+    call assert_equal('/path',       simplify('///path'))
+    call assert_equal('/path',       simplify('////path'))
+  endif
 
   call assert_equal('./dir/file',  './dir/file'->simplify())
   call assert_equal('./dir/file',  simplify('.///dir//file'))
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    986,
+/**/
     985,
 /**/
     984,