diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-22 20:06:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-22 20:06:26 +0200 |
| commit | 320bf2d85e9e2924d896b3072979598c954922e7 (patch) | |
| tree | f30d5a21eddedc6b9ed60b1d14524badc9f45989 | |
| parent | 4c5765bc47b2708075e8d8471e8d342079479777 (diff) | |
patch 8.1.0317: Cscope test fails when using shadow directoryv8.1.0317
Problem: Cscope test fails when using shadow directory.
Solution: Resolve symlink in Vim. (James McCoy, closes #3364)
| -rw-r--r-- | src/testdir/test_cscope.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim index 71d5487ce3..63f2c182ed 100644 --- 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 0ffd11e4f5..d5993815c6 100644 --- 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, |