changeset 15691:a8ed064ed316 v8.1.0853

patch 8.1.0853: options test fails on Mac commit https://github.com/vim/vim/commit/cbbd0f657803a9a3a9f5e2c66bce6e1ea1d6a64b Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 30 22:36:18 2019 +0100 patch 8.1.0853: options test fails on Mac Problem: Options test fails on Mac. Solution: Remove a trailing slash from $TMPDIR.
author Bram Moolenaar <Bram@vim.org>
date Wed, 30 Jan 2019 22:45:06 +0100
parents 1cf39a0d90c9
children 62b5f69be0d4
files src/testdir/test_options.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -387,8 +387,10 @@ func Test_backupskip()
   for var in  ['$TMPDIR', '$TMP', '$TEMP']
     if exists(var)
       let varvalue = substitute(expand(var), '\\', '/', 'g')
-      let found = (index(bsklist, varvalue.'/*') >= 0)
-      call assert_true(found, var . ' not in option bsk: ' . &bsk)
+      let varvalue = substitute(varvalue, '/$', '', '')
+      let varvalue .= '/*'
+      let found = (index(bsklist, varvalue) >= 0)
+      call assert_true(found, var . ' (' . varvalue . ') not in option bsk: ' . &bsk)
     endif
   endfor
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    853,
+/**/
     852,
 /**/
     851,