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.
2026-01-02 01:23:30 +08:00 · 2019-06-03 21:49:51 +01:00
parent c6a5cbb3c7
commit 4129c356e8
6 changed files with 133 additions and 36 deletions
--- a/test/command_callback/test_c_cppcheck_command_callbacks.vader
+++ b/test/command_callback/test_c_cppcheck_command_callbacks.vader
@@ -1,9 +1,15 @@
 Before:
  call ale#assert#SetUpLinterTest('c', '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
+
  call ale#assert#TearDownLinterTest()

  unlet! b:command_tail
@@ -15,17 +21,15 @@ Execute(The executable should be configurable):

  AssertLinter 'foobar', ale#Escape('foobar') . b:command_tail

-Execute(cppcheck for C++ should detect compile_commands.json files):
-  call ale#test#SetFilename('cppcheck_paths/one/foo.cpp')
+Execute(cppcheck for C should detect compile_commands.json files):
+  call ale#test#SetFilename('cppcheck_paths/one/foo.c')

  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):
+Execute(cppcheck for C should detect compile_commands.json files in build directories):
  call ale#test#SetFilename('cppcheck_paths/with_build_dir/foo.cpp')

  AssertLinter 'cppcheck',
@@ -34,3 +38,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.c')
+
+  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'
--- 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'
--- a/test/handler/test_rstcheck_lint_handler.vader
+++ b/test/handler/test_rstcheck_lint_handler.vader
@@ -1,36 +1,42 @@
 Before:
-  runtime ale_linters/rstcheck/rstcheck.vim
+  runtime ale_linters/rst/rstcheck.vim

 After:
  call ale#linter#Reset()

 Execute(Warning and error messages should be handled correctly):
+  " For some reason we can't set the directory such that the filenames are
+  " correct here when running the tests from the Docker image, so we have to
+  " just check the basenames of the files instead.
  AssertEqual
  \ [
  \   {
-  \      'filename': ale#path#Simplify(expand('%:p:h') . '/bad_python.rst'),
+  \      'filename': 'bad_python.rst',
  \      'lnum': 7,
  \      'col': 0,
  \      'type': 'W',
  \      'text': '(python) unexpected EOF while parsing',
  \   },
  \   {
-  \      'filename': ale#path#Simplify(expand('%:p:h') . '/bad_cpp.rst'),
+  \      'filename': 'bad_cpp.rst',
  \      'lnum': 9,
  \      'col': 0,
  \      'type': 'W',
  \      'text': '(cpp) error: ''x'' was not declared in this scope',
  \   },
  \   {
-  \      'filename': ale#path#Simplify(expand('%:p:h') . '/bad_rst.rst'),
+  \      'filename': 'bad_rst.rst',
  \      'lnum': 1,
  \      'col': 0,
  \      'type': 'E',
  \      'text': 'Title overline & underline mismatch.',
  \   },
  \ ],
-  \ ale_linters#rst#rstcheck#Handle(1, [
-  \   'bad_python.rst:7: (ERROR/3) (python) unexpected EOF while parsing',
-  \   'bad_cpp.rst:9: (ERROR/3) (cpp) error: ''x'' was not declared in this scope',
-  \   'bad_rst.rst:1: (SEVERE/4) Title overline & underline mismatch.',
-  \])
+  \ map(
+  \   ale_linters#rst#rstcheck#Handle(1, [
+  \     'bad_python.rst:7: (ERROR/3) (python) unexpected EOF while parsing',
+  \     'bad_cpp.rst:9: (ERROR/3) (cpp) error: ''x'' was not declared in this scope',
+  \     'bad_rst.rst:1: (SEVERE/4) Title overline & underline mismatch.',
+  \   ]),
+  \   'extend(v:val, {''filename'': fnamemodify(v:val.filename, '':t'')})'
+  \ )