diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-28 22:47:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 22:47:54 +0200 |
| commit | 6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c (patch) | |
| tree | 537bc9d4b64dce8854cc0327089b8e62ed5d17d0 /src | |
| parent | 1d59575450e0a09d710a7cad2b8e1b5c5e0242f5 (diff) | |
| download | rneovim-6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c.tar.gz rneovim-6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c.tar.bz2 rneovim-6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c.zip | |
tests: use runtime from build for doc/tags with :help (#10479)
This is better practice in general, and allows to remove the "helptags
ALL" hacks.
Ref: https://github.com/neovim/neovim/issues/8824
Ref: https://github.com/neovim/neovim/commit/f1b67c3453c
* Makefile: fix dependencies with regard to helptags
- use the file as the main target to avoid unnecessary triggering
- use "make oldtest" on Travis to ensure it gets built
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_autocmd.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cmdline.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_taglist.vim | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index fa25740994..593ce6fcdc 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -74,6 +74,9 @@ set nomore " Output all messages in English. lang mess C +" Nvim: append runtime from build dir, which contains the generated doc/tags. +let &runtimepath .= ','.expand($BUILD_DIR).'/runtime/' + " Always use forward slashes. set shellslash diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim index 4c9df0cb16..16bacf4591 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -300,7 +300,6 @@ func Test_augroup_warning() endfunc func Test_BufReadCmdHelp() - helptags ALL " This used to cause access to free memory au BufReadCmd * e +h help @@ -382,7 +381,6 @@ func Test_three_windows() only - helptags ALL help wincmd w 1quit diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index b8b018d5f7..f43ea0e923 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -242,7 +242,6 @@ func Test_getcompletion() let l = getcompletion('break', 'compiler') call assert_equal([], l) - helptags ALL let l = getcompletion('last', 'help') call assert_true(index(l, ':tablast') >= 0) let l = getcompletion('giveup', 'help') diff --git a/src/nvim/testdir/test_taglist.vim b/src/nvim/testdir/test_taglist.vim index eb64e59509..a0dc8ca524 100644 --- a/src/nvim/testdir/test_taglist.vim +++ b/src/nvim/testdir/test_taglist.vim @@ -89,8 +89,11 @@ func Test_tagfiles() help let tf = tagfiles() + " Nvim: expectation(s) based on tags in build dir (added to &rtp). + " Filter out the (non-existing) '../../../runtime/doc/tags'. + call filter(tf, 'filereadable(v:val)') call assert_equal(1, len(tf)) - call assert_equal(fnamemodify(expand('$VIMRUNTIME/doc/tags'), ':p:gs?\\?/?'), + call assert_equal(fnamemodify(expand('$BUILD_DIR/runtime/doc/tags'), ':p:gs?\\?/?'), \ fnamemodify(tf[0], ':p:gs?\\?/?')) helpclose call assert_equal(['Xtags1', 'Xtags2'], tagfiles()) |