From 2b785688ead505dcbc1007374d3dca9914aa247a Mon Sep 17 00:00:00 2001 From: w0rp Date: Thu, 20 Aug 2020 01:46:29 +0100 Subject: #3299 Merge gcc and clang into a cc linter Users can easily be confused when they set some options for a C or C++ compiler, and another compiler is run with different options, which still reports errors. To remedy this, the existing `gcc` and `clang` linters have been replaced with a `cc` linter that will run either compiler. This is a breaking change for ALE v3.0.0. --- .../test_cpp_gcc_command_callbacks.vader | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'test/command_callback/test_cpp_gcc_command_callbacks.vader') diff --git a/test/command_callback/test_cpp_gcc_command_callbacks.vader b/test/command_callback/test_cpp_gcc_command_callbacks.vader index 9a64e6a4..930cc68a 100644 --- a/test/command_callback/test_cpp_gcc_command_callbacks.vader +++ b/test/command_callback/test_cpp_gcc_command_callbacks.vader @@ -1,16 +1,26 @@ Before: Save g:ale_c_parse_makefile + Save g:ale_history_enabled + let g:ale_c_parse_makefile = 0 + let g:ale_history_enabled = 0 let g:get_cflags_return_value = '' + let g:executable_map = {} runtime autoload/ale/c.vim + runtime autoload/ale/engine.vim + + function! ale#engine#IsExecutable(buffer, executable) abort + return has_key(g:executable_map, a:executable) + endfunction function! ale#c#GetCFlags(buffer, output) abort return g:get_cflags_return_value endfunction - call ale#assert#SetUpLinterTest('cpp', 'gcc') + call ale#assert#SetUpLinterTest('cpp', 'cc') + let b:command_tail = ' -S -x c++' \ . ' -o ' . (has('win32') ? 'nul': '/dev/null') \ . ' -iquote ' . ale#Escape(getcwd()) @@ -18,18 +28,25 @@ Before: After: unlet! g:get_cflags_return_value + unlet! g:executable_map unlet! b:command_tail runtime autoload/ale/c.vim + runtime autoload/ale/engine.vim call ale#assert#TearDownLinterTest() +Execute(clang++ should be used instead of gcc, if available): + let g:executable_map = {'clang++': 1} + + AssertLinter 'clang++', [ale#Escape('clang++') . b:command_tail] + Execute(The executable should be configurable): - AssertLinter 'gcc', ale#Escape('gcc') . b:command_tail + AssertLinter 'gcc', [ale#Escape('gcc') . b:command_tail] - let b:ale_cpp_gcc_executable = 'foobar' + let b:ale_cpp_cc_executable = 'foobar' - AssertLinter 'foobar', ale#Escape('foobar') . b:command_tail + AssertLinter 'foobar', [ale#Escape('foobar') . b:command_tail] Execute(The -std flag should be replaced by parsed C flags): let b:command_tail = substitute(b:command_tail, 'c++14', 'c++11 ', '') -- cgit v1.2.3