diff options
| author | w0rp <devw0rp@gmail.com> | 2019-05-20 19:57:08 +0100 |
|---|---|---|
| committer | w0rp <devw0rp@gmail.com> | 2019-05-20 19:57:08 +0100 |
| commit | 143af2b9fd78dbfd5ee8ae727a522dd2dcc79b61 (patch) | |
| tree | 2c44b311a5f127cba4654ff4f9a1e450d55f365a /test/command_callback | |
| parent | 781bf1502f78f7882347a70b587512a0e94ea380 (diff) | |
| download | ale-143af2b9fd78dbfd5ee8ae727a522dd2dcc79b61.zip | |
Fix #2421 - Use compile_commands.json in build dirs to find roots
Diffstat (limited to 'test/command_callback')
| -rw-r--r-- | test/command_callback/cquery_paths/build/compile_commands.json (renamed from test/command_callback/cquery_paths/with_compile_commands_json/compile_commands.json) | 0 | ||||
| -rw-r--r-- | test/command_callback/test_c_cquery_command_callbacks.vader | 4 | ||||
| -rw-r--r-- | test/command_callback/test_c_import_paths.vader | 2 | ||||
| -rw-r--r-- | test/command_callback/test_cpp_cquery_command_callbacks.vader | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/test/command_callback/cquery_paths/with_compile_commands_json/compile_commands.json b/test/command_callback/cquery_paths/build/compile_commands.json index e69de29b..e69de29b 100644 --- a/test/command_callback/cquery_paths/with_compile_commands_json/compile_commands.json +++ b/test/command_callback/cquery_paths/build/compile_commands.json diff --git a/test/command_callback/test_c_cquery_command_callbacks.vader b/test/command_callback/test_c_cquery_command_callbacks.vader index 13b7a567..a2e03889 100644 --- a/test/command_callback/test_c_cquery_command_callbacks.vader +++ b/test/command_callback/test_c_cquery_command_callbacks.vader @@ -7,9 +7,9 @@ After: Execute(The project root should be detected correctly using compile_commands.json file): AssertLSPProject '' - call ale#test#SetFilename('cquery_paths/with_compile_commands_json/dummy.c') + call ale#test#SetFilename('cquery_paths/dummy.c') - AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_compile_commands_json') + AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths') Execute(The project root should be detected correctly using .cquery file): AssertLSPProject '' diff --git a/test/command_callback/test_c_import_paths.vader b/test/command_callback/test_c_import_paths.vader index f941e0fa..6c616d89 100644 --- a/test/command_callback/test_c_import_paths.vader +++ b/test/command_callback/test_c_import_paths.vader @@ -2,6 +2,7 @@ Before: " Make sure the c.vim file is loaded first. call ale#c#FindProjectRoot(bufnr('')) + Save g:ale_c_parse_compile_commands Save g:ale_c_parse_makefile Save g:__ale_c_project_filenames @@ -14,6 +15,7 @@ Before: \ 'v:val isnot# ''.git/HEAD''' \) + let g:ale_c_parse_compile_commands = 0 let g:ale_c_parse_makefile = 0 After: diff --git a/test/command_callback/test_cpp_cquery_command_callbacks.vader b/test/command_callback/test_cpp_cquery_command_callbacks.vader index 682c90d5..7eb2a284 100644 --- a/test/command_callback/test_cpp_cquery_command_callbacks.vader +++ b/test/command_callback/test_cpp_cquery_command_callbacks.vader @@ -10,9 +10,9 @@ After: Execute(The project root should be detected correctly using compile_commands.json file): AssertLSPProject '' - call ale#test#SetFilename('cquery_paths/with_compile_commands_json/dummy.cpp') + call ale#test#SetFilename('cquery_paths/dummy.cpp') - AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths/with_compile_commands_json') + AssertLSPProject ale#path#Simplify(g:dir . '/cquery_paths') Execute(The project root should be detected correctly using .cquery file): AssertLSPProject '' |