From 4129c356e85ef05836d2dd726cae679ae7f4afc9 Mon Sep 17 00:00:00 2001 From: Christoph Koehler Date: Mon, 3 Jun 2019 21:49:51 +0100 Subject: Fix #1279 - Run cppcheck differently when modified cppcheck is now run without the --project option and from the buffer's directory instead when the buffer has been modified. Saving the buffer will get results by linting the project instead. --- .../test_cpp_cppcheck_command_callbacks.vader | 36 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) (limited to 'test/command_callback/test_cpp_cppcheck_command_callbacks.vader') diff --git a/test/command_callback/test_cpp_cppcheck_command_callbacks.vader b/test/command_callback/test_cpp_cppcheck_command_callbacks.vader index 15c8c4b8..13b0741e 100644 --- a/test/command_callback/test_cpp_cppcheck_command_callbacks.vader +++ b/test/command_callback/test_cpp_cppcheck_command_callbacks.vader @@ -1,8 +1,14 @@ Before: call ale#assert#SetUpLinterTest('cpp', 'cppcheck') - let b:command_tail = ' -q --language=c++ --enable=style %t' + let b:command_tail = ' -q --language=c++ --enable=style -I' . ale#Escape(ale#path#Simplify(g:dir)) .' %t' After: + " Remove a test file we might open for some tests. + if &buftype != 'nofile' + :q! + set buftype=nofile + endif + unlet! b:command_tail call ale#assert#TearDownLinterTest() @@ -19,9 +25,7 @@ Execute(cppcheck for C++ should detect compile_commands.json files): AssertLinter 'cppcheck', \ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/one')) \ . ale#Escape('cppcheck') - \ . ' -q --language=c++' - \ . ' --project=' . ale#Escape('compile_commands.json') - \ . ' --enable=style %t' + \ . ' -q --language=c++ --project=''compile_commands.json'' --enable=style %t' Execute(cppcheck for C++ should detect compile_commands.json files in build directories): call ale#test#SetFilename('cppcheck_paths/with_build_dir/foo.cpp') @@ -32,3 +36,27 @@ Execute(cppcheck for C++ should detect compile_commands.json files in build dire \ . ' -q --language=c++' \ . ' --project=' . ale#Escape(ale#path#Simplify('build/compile_commands.json')) \ . ' --enable=style %t' + +Execute(cppcheck for C++ should include file dir if compile_commands.json file is not found): + call ale#test#SetFilename('cppcheck_paths/foo.cpp') + + AssertLinter 'cppcheck', + \ ale#Escape('cppcheck') + \ . ' -q --language=c++' + \ . ' --enable=style' + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths')) + \ . ' %t' + +Execute(cppcheck for C++ should ignore compile_commands.json file if buffer is modified): + call ale#test#SetFilename('cppcheck_paths/one/foo.cpp') + + set buftype= + set modified + + AssertLinter 'cppcheck', + \ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/one')) + \ . ale#Escape('cppcheck') + \ . ' -q --language=c++' + \ . ' --enable=style' + \ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths/one')) + \ . ' %t' -- cgit v1.2.3