summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroel0 <roel.postelmans@altran.com>2018-03-21 07:37:32 +0100
committerroel0 <roel.postelmans@altran.com>2018-03-21 07:37:32 +0100
commit7593e2037741fa264aa4029529180cc152c802b6 (patch)
tree5bf0bacb426fa4529b00db797841a34519cded4b
parent18d0aeb1a0cca2b749c3d2232f853fcaddcdb56b (diff)
downloadale-7593e2037741fa264aa4029529180cc152c802b6.zip
Fix failing unit tests for windows
-rw-r--r--autoload/ale/c.vim2
-rw-r--r--test/test_c_parse_makefile.vader8
2 files changed, 5 insertions, 5 deletions
diff --git a/autoload/ale/c.vim b/autoload/ale/c.vim
index 314bb9a9..6d5d94d2 100644
--- a/autoload/ale/c.vim
+++ b/autoload/ale/c.vim
@@ -1,4 +1,4 @@
-" Author: gagbo <gagbobada@gmail.com>, w0rp <devw0rp@gmail.com>
+" Author: gagbo <gagbobada@gmail.com>, w0rp <devw0rp@gmail.com>, roel0 <postelmansroel@gmail.com>
" Description: Functions for integrating with C-family linters.
call ale#Set('c_parse_makefile', 0)
diff --git a/test/test_c_parse_makefile.vader b/test/test_c_parse_makefile.vader
index 1fb67c95..a5d45913 100644
--- a/test/test_c_parse_makefile.vader
+++ b/test/test_c_parse_makefile.vader
@@ -39,7 +39,7 @@ Execute(The CFlags parser should be able to parse include directives):
call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c')
AssertEqual
- \ ['-I/testplugin/test/test_c_projects/makefile_project/subdir']
+ \ ['-I' . ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir')]
\ , ale#c#ParseCFlags(bufnr(''), 'gcc -Isubdir -c file.c')
Execute(The CFlags parser should be able to parse macro directives):
@@ -48,7 +48,7 @@ Execute(The CFlags parser should be able to parse macro directives):
call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c')
AssertEqual
- \ ['-I/testplugin/test/test_c_projects/makefile_project/subdir',
+ \ ['-I' . ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir'),
\ '-DTEST=1']
\ , ale#c#ParseCFlags(bufnr(''), 'gcc -Isubdir -DTEST=1 -c file.c')
@@ -58,7 +58,7 @@ Execute(The CFlags parser should be able to parse macro directives with spaces):
call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c')
AssertEqual
- \ ['-I/testplugin/test/test_c_projects/makefile_project/subdir',
+ \ ['-I' . ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir'),
\ '-DTEST=$(( 2 * 4 ))']
\ , ale#c#ParseCFlags(bufnr(''), 'gcc -Isubdir -DTEST=$(( 2 * 4 )) -c file.c')
@@ -68,7 +68,7 @@ Execute(The CFlags parser should be able to parse shell directives with spaces):
call ale#test#SetFilename('test_c_projects/makefile_project/subdir/file.c')
AssertEqual
- \ ['-I/testplugin/test/test_c_projects/makefile_project/subdir',
+ \ ['-I' . ale#path#Simplify(g:dir. '/test_c_projects/makefile_project/subdir'),
\ '-DTEST=`date +%s`']
\ , ale#c#ParseCFlags(bufnr(''), 'gcc -Isubdir -DTEST=`date +%s` -c file.c')