mirror of
https://github.com/dense-analysis/ale.git
synced 2026-05-25 01:38:41 +08:00
fix(tests): fix ale_c_build_dir_names being unset in tests (#5109)
CI / build_image (push) Has been cancelled
CI / test_ale (--linters-only) (push) Has been cancelled
CI / test_ale (--lua-only) (push) Has been cancelled
CI / test_ale (--neovim-07-only) (push) Has been cancelled
CI / test_ale (--neovim-08-only) (push) Has been cancelled
CI / test_ale (--vim-80-only) (push) Has been cancelled
CI / test_ale (--vim-90-only) (push) Has been cancelled
CI / build_image (push) Has been cancelled
CI / test_ale (--linters-only) (push) Has been cancelled
CI / test_ale (--lua-only) (push) Has been cancelled
CI / test_ale (--neovim-07-only) (push) Has been cancelled
CI / test_ale (--neovim-08-only) (push) Has been cancelled
CI / test_ale (--vim-80-only) (push) Has been cancelled
CI / test_ale (--vim-90-only) (push) Has been cancelled
- Use ale#Set() to set the ale_c_build_dir_names variable. - Ensure SetUpLinterTest() is called before any Save commands in tests. - Add c.vim to runtime before non-linter tests are executed. - Remove workarounds in c.vim.
This commit is contained in:
+1
-14
@@ -10,7 +10,7 @@ let s:sep = has('win32') ? '\' : '/'
|
|||||||
" Set just so tests can override it.
|
" Set just so tests can override it.
|
||||||
let g:__ale_c_project_filenames = ['.git/HEAD', 'configure', 'Makefile', 'CMakeLists.txt']
|
let g:__ale_c_project_filenames = ['.git/HEAD', 'configure', 'Makefile', 'CMakeLists.txt']
|
||||||
|
|
||||||
let g:ale_c_build_dir_names = get(g:, 'ale_c_build_dir_names', [
|
call ale#Set('c_build_dir_names', [
|
||||||
\ 'build',
|
\ 'build',
|
||||||
\ 'build/Debug',
|
\ 'build/Debug',
|
||||||
\ 'build/Release',
|
\ 'build/Release',
|
||||||
@@ -18,10 +18,6 @@ let g:ale_c_build_dir_names = get(g:, 'ale_c_build_dir_names', [
|
|||||||
\])
|
\])
|
||||||
|
|
||||||
function! s:CanParseMakefile(buffer) abort
|
function! s:CanParseMakefile(buffer) abort
|
||||||
" Something somewhere seems to delete this setting in tests, so ensure we
|
|
||||||
" always have a default value.
|
|
||||||
call ale#Set('c_parse_makefile', 0)
|
|
||||||
|
|
||||||
return ale#Var(a:buffer, 'c_parse_makefile')
|
return ale#Var(a:buffer, 'c_parse_makefile')
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
@@ -246,15 +242,6 @@ function! ale#c#FindCompileCommands(buffer) abort
|
|||||||
return [fnamemodify(l:json_file, ':h'), l:json_file]
|
return [fnamemodify(l:json_file, ':h'), l:json_file]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Something somewhere seems to delete this setting in tests, so ensure
|
|
||||||
" we always have a default value.
|
|
||||||
call ale#Set('c_build_dir_names', [
|
|
||||||
\ 'build',
|
|
||||||
\ 'build/Debug',
|
|
||||||
\ 'build/Release',
|
|
||||||
\ 'bin',
|
|
||||||
\])
|
|
||||||
|
|
||||||
" Search in build directories if we can't find it in the project.
|
" Search in build directories if we can't find it in the project.
|
||||||
for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h'))
|
for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h'))
|
||||||
for l:dirname in ale#Var(a:buffer, 'c_build_dir_names')
|
for l:dirname in ale#Var(a:buffer, 'c_build_dir_names')
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
Before:
|
Before:
|
||||||
|
call ale#assert#SetUpLinterTest('c', 'cc')
|
||||||
|
|
||||||
Save g:ale_c_parse_makefile
|
Save g:ale_c_parse_makefile
|
||||||
Save g:ale_history_enabled
|
Save g:ale_history_enabled
|
||||||
|
|
||||||
@@ -19,8 +21,6 @@ Before:
|
|||||||
return g:get_cflags_return_value
|
return g:get_cflags_return_value
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
call ale#assert#SetUpLinterTest('c', 'cc')
|
|
||||||
|
|
||||||
let b:command_tail = ' -S -x c'
|
let b:command_tail = ' -S -x c'
|
||||||
\ . ' -o ' . (has('win32') ? 'nul': '/dev/null')
|
\ . ' -o ' . (has('win32') ? 'nul': '/dev/null')
|
||||||
\ . ' -iquote %s:h'
|
\ . ' -iquote %s:h'
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
Before:
|
Before:
|
||||||
Save g:ale_c_parse_makefile
|
|
||||||
let g:ale_c_parse_makefile = 0
|
|
||||||
|
|
||||||
call ale#assert#SetUpLinterTest('c', 'clangtidy')
|
call ale#assert#SetUpLinterTest('c', 'clangtidy')
|
||||||
call ale#test#SetFilename('test.c')
|
call ale#test#SetFilename('test.c')
|
||||||
|
|
||||||
|
Save g:ale_c_parse_makefile
|
||||||
|
let g:ale_c_parse_makefile = 0
|
||||||
|
|
||||||
After:
|
After:
|
||||||
call ale#assert#TearDownLinterTest()
|
call ale#assert#TearDownLinterTest()
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
Before:
|
Before:
|
||||||
Save g:ale_c_parse_makefile
|
|
||||||
let g:ale_c_parse_makefile = 0
|
|
||||||
|
|
||||||
call ale#assert#SetUpLinterTest('cpp', 'clangtidy')
|
call ale#assert#SetUpLinterTest('cpp', 'clangtidy')
|
||||||
call ale#test#SetFilename('test.cpp')
|
call ale#test#SetFilename('test.cpp')
|
||||||
|
|
||||||
|
Save g:ale_c_parse_makefile
|
||||||
|
let g:ale_c_parse_makefile = 0
|
||||||
|
|
||||||
After:
|
After:
|
||||||
call ale#assert#TearDownLinterTest()
|
call ale#assert#TearDownLinterTest()
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
Before:
|
Before:
|
||||||
|
call ale#assert#SetUpLinterTest('cpp', 'cc')
|
||||||
|
|
||||||
Save g:ale_c_parse_makefile
|
Save g:ale_c_parse_makefile
|
||||||
Save g:ale_history_enabled
|
Save g:ale_history_enabled
|
||||||
|
|
||||||
@@ -8,7 +10,6 @@ Before:
|
|||||||
let g:get_cflags_return_value = ''
|
let g:get_cflags_return_value = ''
|
||||||
let g:executable_map = {}
|
let g:executable_map = {}
|
||||||
|
|
||||||
runtime autoload/ale/c.vim
|
|
||||||
runtime autoload/ale/engine.vim
|
runtime autoload/ale/engine.vim
|
||||||
|
|
||||||
function! ale#engine#IsExecutable(buffer, executable) abort
|
function! ale#engine#IsExecutable(buffer, executable) abort
|
||||||
@@ -19,8 +20,6 @@ Before:
|
|||||||
return g:get_cflags_return_value
|
return g:get_cflags_return_value
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
call ale#assert#SetUpLinterTest('cpp', 'cc')
|
|
||||||
|
|
||||||
let b:command_tail = ' -S -x c++'
|
let b:command_tail = ' -S -x c++'
|
||||||
\ . ' -o ' . (has('win32') ? 'nul': '/dev/null')
|
\ . ' -o ' . (has('win32') ? 'nul': '/dev/null')
|
||||||
\ . ' -iquote %s:h'
|
\ . ' -iquote %s:h'
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
Before:
|
Before:
|
||||||
|
runtime autoload/ale/c.vim
|
||||||
Save g:ale_c_build_dir_names
|
Save g:ale_c_build_dir_names
|
||||||
|
|
||||||
call ale#test#SetDirectory('/testplugin/test')
|
call ale#test#SetDirectory('/testplugin/test')
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
Before:
|
Before:
|
||||||
|
|
||||||
|
runtime autoload/ale/c.vim
|
||||||
|
|
||||||
Save g:ale_c_parse_makefile
|
Save g:ale_c_parse_makefile
|
||||||
Save g:ale_c_always_make
|
Save g:ale_c_always_make
|
||||||
Save b:ale_c_always_make
|
Save b:ale_c_always_make
|
||||||
|
|||||||
Reference in New Issue
Block a user