From 8aae1521e5d8e6d6b16d58e218b57a72801beefe Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 30 Jan 2021 12:20:33 -0500 Subject: vim-patch:8.2.2037: compiler test depends on list of compiler plugins Problem: Compiler test depends on list of compiler plugins. Solution: Compare with the actual list of compiler plugins. https://github.com/vim/vim/commit/60bc8e7244080b7ead009cfabebc3401f272ddbe --- src/nvim/testdir/test_compiler.vim | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test_compiler.vim b/src/nvim/testdir/test_compiler.vim index 9101f8cfa0..4d1107933a 100644 --- a/src/nvim/testdir/test_compiler.vim +++ b/src/nvim/testdir/test_compiler.vim @@ -37,17 +37,24 @@ func Test_compiler() bw! endfunc +func GetCompilerNames() + return glob('$VIMRUNTIME/compiler/*.vim', 0, 1) + \ ->map({k, v -> substitute(v, '.*[\\/]\([a-zA-Z0-9_\-]*\).vim', '\1', '')}) +endfunc + func Test_compiler_without_arg() let runtime = substitute($VIMRUNTIME, '\\', '/', 'g') let a = split(execute('compiler')) - call assert_match(runtime .. '/compiler/ant.vim$', a[0]) - call assert_match(runtime .. '/compiler/bcc.vim$', a[1]) - call assert_match(runtime .. '/compiler/xo.vim$', a[-1]) + let exp = GetCompilerNames() + call assert_match(runtime .. '/compiler/' .. exp[0] .. '.vim$', a[0]) + call assert_match(runtime .. '/compiler/' .. exp[1] .. '.vim$', a[1]) + call assert_match(runtime .. '/compiler/' .. exp[-1] .. '.vim$', a[-1]) endfunc func Test_compiler_completion() + let clist = GetCompilerNames()->join(' ') call feedkeys(":compiler \\\"\", 'tx') - call assert_match('^"compiler ant bcc .* xmlwf xo$', @:) + call assert_match('^"compiler ' .. clist .. '$', @:) call feedkeys(":compiler p\\\"\", 'tx') call assert_equal('"compiler pbx perl php pylint pyunit', @:) -- cgit