fix(tests): fix alecbuilddirnames being unset in tests (#5109)

Use ale#Set() to set the alecbuilddirnames variable.
Ensure SetUpLinterTest() is called before any Save commands in tests.
Add c.vim to runtime before non-linter tests are executed.
Remove workarounds in c.vim.

7 files changed, 15 insertions, 25 deletions

diff --git a/autoload/ale/c.vim b/autoload/ale/c.vim
index 329637b5c..09038925b 100644
--- a/autoload/ale/c.vim
+++ b/autoload/ale/c.vim
@@ -10,7 +10,7 @@ let s:sep = has('win32') ? '\' : '/'
 " Set just so tests can override it.
 let g:__ale_c_project_filenames = ['.git/HEAD', 'configure', 'Makefile', 'CMakeLists.txt']
 
-let g:ale_c_build_dir_names = get(g:, 'ale_c_build_dir_names', [
+call ale#Set('c_build_dir_names', [
 \   'build',
 \   'build/Debug',
 \   'build/Release',
@@ -18,10 +18,6 @@ let g:ale_c_build_dir_names = get(g:, 'ale_c_build_dir_names', [
 \])
 
 function! s:CanParseMakefile(buffer) abort
-    " Something somewhere seems to delete this setting in tests, so ensure we
-    " always have a default value.
-    call ale#Set('c_parse_makefile', 0)
-
     return ale#Var(a:buffer, 'c_parse_makefile')
 endfunction
 
@@ -246,15 +242,6 @@ function! ale#c#FindCompileCommands(buffer) abort
         return [fnamemodify(l:json_file, ':h'), l:json_file]
     endif
 
-    " Something somewhere seems to delete this setting in tests, so ensure
-    " we always have a default value.
-    call ale#Set('c_build_dir_names', [
-    \   'build',
-    \   'build/Debug',
-    \   'build/Release',
-    \   'bin',
-    \])
-
     " Search in build directories if we can't find it in the project.
     for l:path in ale#path#Upwards(expand('#' . a:buffer . ':p:h'))
         for l:dirname in ale#Var(a:buffer, 'c_build_dir_names')
diff --git a/test/linter/test_c_cc.vader b/test/linter/test_c_cc.vader
index ce4bd162e..cf739e3c4 100644
--- a/test/linter/test_c_cc.vader
+++ b/test/linter/test_c_cc.vader
@@ -1,4 +1,6 @@
 Before:
+  call ale#assert#SetUpLinterTest('c', 'cc')
+
   Save g:ale_c_parse_makefile
   Save g:ale_history_enabled
 
@@ -19,8 +21,6 @@ Before:
     return g:get_cflags_return_value
   endfunction
 
-  call ale#assert#SetUpLinterTest('c', 'cc')
-
   let b:command_tail = ' -S -x c'
   \   . ' -o ' . (has('win32') ? 'nul': '/dev/null')
   \   . ' -iquote %s:h'
diff --git a/test/linter/test_c_clang_tidy.vader b/test/linter/test_c_clang_tidy.vader
index 2dfb34947..07b27c129 100644
--- a/test/linter/test_c_clang_tidy.vader
+++ b/test/linter/test_c_clang_tidy.vader
@@ -1,10 +1,10 @@
 Before:
-  Save g:ale_c_parse_makefile
-  let g:ale_c_parse_makefile = 0
-
   call ale#assert#SetUpLinterTest('c', 'clangtidy')
   call ale#test#SetFilename('test.c')
 
+  Save g:ale_c_parse_makefile
+  let g:ale_c_parse_makefile = 0
+
 After:
   call ale#assert#TearDownLinterTest()
 
diff --git a/test/linter/test_clang_tidy.vader b/test/linter/test_clang_tidy.vader
index f7f0aa744..a11522d62 100644
--- a/test/linter/test_clang_tidy.vader
+++ b/test/linter/test_clang_tidy.vader
@@ -1,10 +1,10 @@
 Before:
-  Save g:ale_c_parse_makefile
-  let g:ale_c_parse_makefile = 0
-
   call ale#assert#SetUpLinterTest('cpp', 'clangtidy')
   call ale#test#SetFilename('test.cpp')
 
+  Save g:ale_c_parse_makefile
+  let g:ale_c_parse_makefile = 0
+
 After:
   call ale#assert#TearDownLinterTest()
 
diff --git a/test/linter/test_cpp_cc.vader b/test/linter/test_cpp_cc.vader
index e6794c095..334b57517 100644
--- a/test/linter/test_cpp_cc.vader
+++ b/test/linter/test_cpp_cc.vader
@@ -1,4 +1,6 @@
 Before:
+  call ale#assert#SetUpLinterTest('cpp', 'cc')
+
   Save g:ale_c_parse_makefile
   Save g:ale_history_enabled
 
@@ -8,7 +10,6 @@ Before:
   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
@@ -19,8 +20,6 @@ Before:
     return g:get_cflags_return_value
   endfunction
 
-  call ale#assert#SetUpLinterTest('cpp', 'cc')
-
   let b:command_tail = ' -S -x c++'
   \   . ' -o ' . (has('win32') ? 'nul': '/dev/null')
   \   . ' -iquote %s:h'
diff --git a/test/test_c_find_compile_commands.vader b/test/test_c_find_compile_commands.vader
index c24f26c0a..204f81f78 100644
--- a/test/test_c_find_compile_commands.vader
+++ b/test/test_c_find_compile_commands.vader
@@ -1,4 +1,5 @@
 Before:
+  runtime autoload/ale/c.vim
   Save g:ale_c_build_dir_names
 
   call ale#test#SetDirectory('/testplugin/test')
diff --git a/test/test_c_flag_parsing.vader b/test/test_c_flag_parsing.vader
index c661651ec..759ae900b 100644
--- a/test/test_c_flag_parsing.vader
+++ b/test/test_c_flag_parsing.vader
@@ -1,4 +1,7 @@
 Before:
+
+  runtime autoload/ale/c.vim
+
   Save g:ale_c_parse_makefile
   Save g:ale_c_always_make
   Save b:ale_c_always_make