From 54ff57317455994305b8bba085c5db166dc34373 Mon Sep 17 00:00:00 2001 From: w0rp Date: Sun, 16 Jul 2017 21:37:10 +0100 Subject: #711 - Make the clang executables configurable --- .../test_c_clang_command_callbacks.vader | 39 ++++++++++++++++++++++ .../test_cpp_clang_command_callbacks.vader | 39 ++++++++++++++++++++++ test/test_c_import_paths.vader | 27 ++++++++++----- 3 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 test/command_callback/test_c_clang_command_callbacks.vader create mode 100644 test/command_callback/test_cpp_clang_command_callbacks.vader (limited to 'test') diff --git a/test/command_callback/test_c_clang_command_callbacks.vader b/test/command_callback/test_c_clang_command_callbacks.vader new file mode 100644 index 00000000..d6fc8ca6 --- /dev/null +++ b/test/command_callback/test_c_clang_command_callbacks.vader @@ -0,0 +1,39 @@ +Before: + Save g:ale_c_clang_executable + Save g:ale_c_clang_options + + unlet! g:ale_c_clang_executable + unlet! b:ale_c_clang_executable + unlet! g:ale_c_clang_options + unlet! b:ale_c_clang_options + + runtime ale_linters/c/clang.vim + + let b:command_tail = ' -S -x c -fsyntax-only -iquote' + \ . ' ' . ale#Escape(getcwd()) + \ . ' -std=c11 -Wall -' + +After: + Restore + unlet! b:command_tail + unlet! b:ale_c_clang_executable + unlet! b:ale_c_clang_options + call ale#linter#Reset() + +Execute(The executable should be configurable): + AssertEqual 'clang', ale_linters#c#clang#GetExecutable(bufnr('')) + + let b:ale_c_clang_executable = 'foobar' + + AssertEqual 'foobar', ale_linters#c#clang#GetExecutable(bufnr('')) + +Execute(The executable should be used in the command): + AssertEqual + \ ale#Escape('clang') . b:command_tail, + \ ale_linters#c#clang#GetCommand(bufnr('')) + + let b:ale_c_clang_executable = 'foobar' + + AssertEqual + \ ale#Escape('foobar') . b:command_tail, + \ ale_linters#c#clang#GetCommand(bufnr('')) diff --git a/test/command_callback/test_cpp_clang_command_callbacks.vader b/test/command_callback/test_cpp_clang_command_callbacks.vader new file mode 100644 index 00000000..67d6898c --- /dev/null +++ b/test/command_callback/test_cpp_clang_command_callbacks.vader @@ -0,0 +1,39 @@ +Before: + Save g:ale_cpp_clang_executable + Save g:ale_cpp_clang_options + + unlet! g:ale_cpp_clang_executable + unlet! b:ale_cpp_clang_executable + unlet! g:ale_cpp_clang_options + unlet! b:ale_cpp_clang_options + + runtime ale_linters/cpp/clang.vim + + let b:command_tail = ' -S -x c++ -fsyntax-only -iquote' + \ . ' ' . ale#Escape(getcwd()) + \ . ' -std=c++14 -Wall -' + +After: + Restore + unlet! b:command_tail + unlet! b:ale_cpp_clang_executable + unlet! b:ale_cpp_clang_options + call ale#linter#Reset() + +Execute(The executable should be configurable): + AssertEqual 'clang++', ale_linters#cpp#clang#GetExecutable(bufnr('')) + + let b:ale_cpp_clang_executable = 'foobar' + + AssertEqual 'foobar', ale_linters#cpp#clang#GetExecutable(bufnr('')) + +Execute(The executable should be used in the command): + AssertEqual + \ ale#Escape('clang++') . b:command_tail, + \ ale_linters#cpp#clang#GetCommand(bufnr('')) + + let b:ale_cpp_clang_executable = 'foobar' + + AssertEqual + \ ale#Escape('foobar') . b:command_tail, + \ ale_linters#cpp#clang#GetCommand(bufnr('')) diff --git a/test/test_c_import_paths.vader b/test/test_c_import_paths.vader index fbc3d563..ae6375f5 100644 --- a/test/test_c_import_paths.vader +++ b/test/test_c_import_paths.vader @@ -85,7 +85,8 @@ Execute(The C Clang handler should include 'include' directories for projects wi call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c') AssertEqual - \ 'clang -S -x c -fsyntax-only ' + \ ale#Escape('clang') + \ . ' -S -x c -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/makefile_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/makefile_project/include') . ' ' \ . ' -' @@ -97,7 +98,8 @@ Execute(The C Clang handler should include 'include' directories for projects wi call ale#test#SetFilename('test_c_projects/h_file_project/subdir/file.c') AssertEqual - \ 'clang -S -x c -fsyntax-only ' + \ ale#Escape('clang') + \ . ' -S -x c -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/h_file_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/h_file_project') . ' ' \ . ' -' @@ -109,7 +111,8 @@ Execute(The C Clang handler should include root directories for projects with .h call ale#test#SetFilename('test_c_projects/h_file_project/subdir/file.c') AssertEqual - \ 'clang -S -x c -fsyntax-only ' + \ ale#Escape('clang') + \ . ' -S -x c -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/h_file_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/h_file_project') . ' ' \ . ' -' @@ -121,7 +124,8 @@ Execute(The C Clang handler should include root directories for projects with .h call ale#test#SetFilename('test_c_projects/hpp_file_project/subdir/file.c') AssertEqual - \ 'clang -S -x c -fsyntax-only ' + \ ale#Escape('clang') + \ . ' -S -x c -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/hpp_file_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/hpp_file_project') . ' ' \ . ' -' @@ -181,7 +185,8 @@ Execute(The C++ Clang handler should include 'include' directories for projects call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.cpp') AssertEqual - \ 'clang++ -S -x c++ -fsyntax-only ' + \ ale#Escape('clang++') + \ . ' -S -x c++ -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/makefile_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/makefile_project/include') . ' ' \ . ' -' @@ -193,7 +198,8 @@ Execute(The C++ Clang handler should include 'include' directories for projects call ale#test#SetFilename('test_c_projects/configure_project/subdir/file.cpp') AssertEqual - \ 'clang++ -S -x c++ -fsyntax-only ' + \ ale#Escape('clang++') + \ . ' -S -x c++ -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/configure_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/configure_project/include') . ' ' \ . ' -' @@ -205,7 +211,8 @@ Execute(The C++ Clang handler should include root directories for projects with call ale#test#SetFilename('test_c_projects/h_file_project/subdir/file.cpp') AssertEqual - \ 'clang++ -S -x c++ -fsyntax-only ' + \ ale#Escape('clang++') + \ . ' -S -x c++ -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/h_file_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/h_file_project') . ' ' \ . ' -' @@ -217,7 +224,8 @@ Execute(The C++ Clang handler should include root directories for projects with call ale#test#SetFilename('test_c_projects/hpp_file_project/subdir/file.cpp') AssertEqual - \ 'clang++ -S -x c++ -fsyntax-only ' + \ ale#Escape('clang++') + \ . ' -S -x c++ -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/hpp_file_project/subdir') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/hpp_file_project') . ' ' \ . ' -' @@ -237,7 +245,8 @@ Execute(The C++ Clang handler shoud use the include directory based on the .git call ale#test#SetFilename('test_c_projects/git_and_nested_makefiles/src/file.cpp') AssertEqual - \ 'clang++ -S -x c++ -fsyntax-only ' + \ ale#Escape('clang++') + \ . ' -S -x c++ -fsyntax-only ' \ . '-iquote ' . ale#Escape(g:dir . '/test_c_projects/git_and_nested_makefiles/src') . ' ' \ . ' -I' . ale#Escape(g:dir . '/test_c_projects/git_and_nested_makefiles/include') . ' ' \ . ' -' -- cgit v1.2.3