changeset 14607:73001276abce v8.1.0317

patch 8.1.0317: Cscope test fails when using shadow directory commit https://github.com/vim/vim/commit/320bf2d85e9e2924d896b3072979598c954922e7 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 22 20:06:26 2018 +0200 patch 8.1.0317: Cscope test fails when using shadow directory Problem: Cscope test fails when using shadow directory. Solution: Resolve symlink in Vim. (James McCoy, closes https://github.com/vim/vim/issues/3364)
author Christian Brabandt <cb@256bit.org>
date Wed, 22 Aug 2018 20:15:08 +0200
parents bde787e80383
children 36ec3ced2468
files src/testdir/test_cscope.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_cscope.vim
+++ b/src/testdir/test_cscope.vim
@@ -259,7 +259,12 @@ endfunc
 " Test ":cs add {dir}"  (add the {dir}/cscope.out database)
 func Test_cscope_add_dir()
   call mkdir('Xcscopedir', 'p')
-  call system('cscope -bk -fXcscopedir/cscope.out ../memfile_test.c')
+
+  " Cscope doesn't handle symlinks, so this needs to be resolved in case a
+  " shadow directory is being used.
+  let memfile = resolve('../memfile_test.c')
+  call system('cscope -bk -fXcscopedir/cscope.out ' . memfile)
+
   cs add Xcscopedir
   let a = execute('cscope show')
   let lines = split(a, "\n", 1)
--- 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 */
 /**/
+    317,
+/**/
     316,
 /**/
     315,