From 7593e2037741fa264aa4029529180cc152c802b6 Mon Sep 17 00:00:00 2001 From: roel0 Date: Wed, 21 Mar 2018 07:37:32 +0100 Subject: [PATCH] Fix failing unit tests for windows --- autoload/ale/c.vim | 2 +- test/test_c_parse_makefile.vader | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autoload/ale/c.vim b/autoload/ale/c.vim index 314bb9a..6d5d94d 100644 --- a/autoload/ale/c.vim +++ b/autoload/ale/c.vim @@ -1,4 +1,4 @@ -" Author: gagbo , w0rp +" Author: gagbo , w0rp , roel0 " 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 1fb67c9..a5d4591 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')