Mercurial > vim
changeset 17093:5cda6165a5c1 v8.1.1546
patch 8.1.1546: in some tests 'tags' is set but not restored
commit https://github.com/vim/vim/commit/0331faf71200a274377e1569fcda4f00c9cf3e2a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 15 18:40:37 2019 +0200
patch 8.1.1546: in some tests 'tags' is set but not restored
Problem: In some tests 'tags' is set but not restored. (Daniel Hahler)
Solution: Restore 'tags'. (closes https://github.com/vim/vim/issues/4535)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 15 Jun 2019 18:45:05 +0200 |
| parents | 57a45b9758ae |
| children | 8ca56a5c3141 |
| files | src/testdir/test_autocmd.vim src/testdir/test_cmdline.vim src/testdir/test_options.vim src/testdir/test_tagcase.vim src/testdir/test_tagjump.vim src/testdir/test_taglist.vim src/version.c |
| diffstat | 7 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1100,6 +1100,7 @@ func Test_OptionSet() " Cleanup au! OptionSet + " set tags& for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp', 'backupext', 'tags', 'spelllang', 'statusline', 'foldignore', 'cmdheight', 'undolevels', 'wrapmargin', 'foldcolumn', 'wrapscan', 'autoread', 'cindent', 'cursorcolumn'] exe printf(":set %s&vim", opt) endfor
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -378,6 +378,7 @@ func Test_getcompletion() endfor call delete('Xtags') + set tags& call assert_fails('call getcompletion("", "burp")', 'E475:') endfunc
--- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -237,6 +237,7 @@ func Test_set_completion() call feedkeys(":set tags=./\\\\ dif\<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"set tags=./\\ diff diffexpr diffopt', @:) + set tags& endfunc func Test_set_errors()
--- a/src/testdir/test_tagcase.vim +++ b/src/testdir/test_tagcase.vim @@ -44,6 +44,7 @@ func Test_tagcase() endfor call delete('Xtags') + set tags& set ic& setg tc& setl tc&
--- a/src/testdir/test_tagjump.vim +++ b/src/testdir/test_tagjump.vim @@ -20,6 +20,7 @@ func Test_cancel_ptjump() call assert_equal(2, winnr('$')) call delete('Xtags') + set tags& quit endfunc @@ -104,6 +105,7 @@ func Test_tagjump_switchbuf() enew | only call delete('Xfile1') call delete('Xtags') + set tags& set switchbuf&vim endfunc @@ -431,7 +433,7 @@ func Test_tagnr_recall() tag call assert_equal(bufname('%'), 'Xtest.h') - set tag& + set tags& call delete('Xtags') bwipe Xtest.h bwipe Xtest.c @@ -467,6 +469,7 @@ func Test_tag_line_toolong() endtry call assert_equal('Ignoring long line in tags file', split(execute('messages'), '\n')[-1]) call delete('Xtags') + set tags& let &verbose = old_vbs endfunc
--- a/src/testdir/test_taglist.vim +++ b/src/testdir/test_taglist.vim @@ -30,6 +30,7 @@ func Test_taglist() call assert_equal('call cursor(3, 4)', cmd[0]['cmd']) call delete('Xtags') + set tags& bwipe endfunc @@ -50,6 +51,7 @@ func Test_taglist_native_etags() \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]})) call delete('Xtags') + set tags& endfunc func Test_taglist_ctags_etags() @@ -69,6 +71,7 @@ func Test_taglist_ctags_etags() \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]})) call delete('Xtags') + set tags& endfunc func Test_tags_too_long() @@ -110,4 +113,5 @@ func Test_tagsfile_without_trailing_newl call assert_equal('Foo', tl[0].name) call delete('Xtags') + set tags& endfunc