thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0317: Cscope test fails when using shadow directory

Browse Source 
Problem:    Cscope test fails when using shadow directory.
Solution:   Resolve symlink in Vim. (James McCoy, closes #3364)
This commit is contained in:
Bram Moolenaar
2018-08-22 20:06:26 +02:00
parent 4c5765bc47
commit 320bf2d85e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/testdir/test_cscope.vim
View File

@@ -259,7 +259,12 @@ endfunc
" Test ":cs add {dir}" (add the {dir}/cscope.out database) " Test ":cs add {dir}" (add the {dir}/cscope.out database)
func Test_cscope_add_dir() func Test_cscope_add_dir()
call mkdir('Xcscopedir', 'p') 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 cs add Xcscopedir
let a = execute('cscope show') let a = execute('cscope show')
let lines = split(a, "\n", 1) let lines = split(a, "\n", 1)

2
src/version.c
View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
317,
/**/ /**/
316, 316,
/**/ /**/