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 #3364)

diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
index 71d5487ce35ce594c3c09e61ef46c7dff054c089..63f2c182edacf1d990905a5a66a47cc50fe404cc 100644 (file)
--- 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)

diff --git a/src/version.c b/src/version.c
index 0ffd11e4f5b9188dca2251bcc942a987d32e5443..d5993815c6e3c5fe7ab90617330dd4bd815d9825 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    317,
 /**/
     316,
 /**/