diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-11-07 19:40:30 +0800 |
---|---|---|
committer | zeertzjq <zeertzjq@outlook.com> | 2022-11-07 19:46:44 +0800 |
commit | a6f972cb6a5ad47613374570d88df2570ae92b9a (patch) | |
tree | de274622e245045228702e845dc3536161276edd | |
parent | 31ffc360f2a4aab469a95a55c532f376443bd5fe (diff) | |
download | rneovim-a6f972cb6a5ad47613374570d88df2570ae92b9a.tar.gz rneovim-a6f972cb6a5ad47613374570d88df2570ae92b9a.tar.bz2 rneovim-a6f972cb6a5ad47613374570d88df2570ae92b9a.zip |
vim-patch:8.2.2060: check for features implemented with "if"
Problem: Check for features implemented with "if".
Solution: Use the Check commands. (Ken Takata, closes vim/vim#7383)
https://github.com/vim/vim/commit/aeb313f355cd67638e3c611354ce401d86f56afe
Cherry-pick test_compiler.vim changes from patch 8.1.2373.
-rw-r--r-- | src/nvim/testdir/test_autocmd.vim | 4 | ||||
-rw-r--r-- | src/nvim/testdir/test_compiler.vim | 8 | ||||
-rw-r--r-- | src/nvim/testdir/test_delete.vim | 14 | ||||
-rw-r--r-- | src/nvim/testdir/test_diffmode.vim | 4 | ||||
-rw-r--r-- | src/nvim/testdir/test_fold.vim | 4 |
5 files changed, 13 insertions, 21 deletions
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim index 1488fe8431..454fb2bdae 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -1975,9 +1975,7 @@ func Test_change_mark_in_autocmds() endfunc func Test_Filter_noshelltemp() - if !executable('cat') - return - endif + CheckExecutable cat enew! call setline(1, ['a', 'b', 'c', 'd']) diff --git a/src/nvim/testdir/test_compiler.vim b/src/nvim/testdir/test_compiler.vim index 3dc8710d63..ec7d143030 100644 --- a/src/nvim/testdir/test_compiler.vim +++ b/src/nvim/testdir/test_compiler.vim @@ -1,9 +1,11 @@ " Test the :compiler command +source check.vim +source shared.vim + func Test_compiler() - if !executable('perl') - return - endif + CheckExecutable perl + CheckFeature quickfix " $LANG changes the output of Perl. if $LANG != '' diff --git a/src/nvim/testdir/test_delete.vim b/src/nvim/testdir/test_delete.vim index b23a3bd025..6b49f153c6 100644 --- a/src/nvim/testdir/test_delete.vim +++ b/src/nvim/testdir/test_delete.vim @@ -1,5 +1,7 @@ " Test for delete(). +source check.vim + func Test_file_delete() split Xfile call setline(1, ['a', 'b']) @@ -41,9 +43,7 @@ func Test_recursive_delete() endfunc func Test_symlink_delete() - if !has('unix') - return - endif + CheckUnix split Xfile call setline(1, ['a', 'b']) wq @@ -56,9 +56,7 @@ func Test_symlink_delete() endfunc func Test_symlink_dir_delete() - if !has('unix') - return - endif + CheckUnix call mkdir('Xdir1') silent !ln -s Xdir1 Xlink call assert_true(isdirectory('Xdir1')) @@ -70,9 +68,7 @@ func Test_symlink_dir_delete() endfunc func Test_symlink_recursive_delete() - if !has('unix') - return - endif + CheckUnix call mkdir('Xdir3') call mkdir('Xdir3/subdir') call mkdir('Xdir4') diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index 831efdbfc2..0de5310735 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -621,9 +621,7 @@ func Test_diff_move_to() endfunc func Test_diffexpr() - if !executable('diff') - return - endif + CheckExecutable diff func DiffExpr() " Prepend some text to check diff type detection diff --git a/src/nvim/testdir/test_fold.vim b/src/nvim/testdir/test_fold.vim index 0a9be310ff..832dd43b65 100644 --- a/src/nvim/testdir/test_fold.vim +++ b/src/nvim/testdir/test_fold.vim @@ -95,9 +95,7 @@ func Test_indent_fold2() endfunc func Test_manual_fold_with_filter() - if !executable('cat') - return - endif + CheckExecutable cat for type in ['manual', 'marker'] exe 'set foldmethod=' . type new |