1 files changed, 39 insertions, 4 deletions
diff --git a/test/command_callback/test_cpp_gcc_command_callbacks.vader b/test/command_callback/test_cpp_gcc_command_callbacks.vader
index cfa4ecc0..930cc68a 100644
--- a/test/command_callback/test_cpp_gcc_command_callbacks.vader
+++ b/test/command_callback/test_cpp_gcc_command_callbacks.vader
@@ -1,20 +1,55 @@
 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', 'cc')
 
-  call ale#assert#SetUpLinterTest('cpp', 'gcc')
   let b:command_tail = ' -S -x c++'
   \   . ' -o ' . (has('win32') ? 'nul': '/dev/null')
   \   . ' -iquote ' . ale#Escape(getcwd())
   \   . ' -std=c++14 -Wall -'
 
 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 ', '')
+  let g:get_cflags_return_value = '-std=c++11'
+
+  AssertLinter 'gcc', ale#Escape('gcc') . b:command_tail