diff --git a/Makefile b/Makefile index 5572ce7..e8376de 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,31 @@ IMAGE ?= w0rp/ale -DOCKER = docker run -a stderr --rm -v $(PWD):/testplugin -v $(PWD)/test:/home -v ${PWD}:/home/ale "$(IMAGE)" +DOCKER_FLAGS = --rm -v $(PWD):/testplugin -v $(PWD)/test:/home "$(IMAGE)" test-setup: docker images -q $(IMAGE) || docker pull $(IMAGE) test: test-setup + @:; \ vims=$$(docker run --rm $(IMAGE) ls /vim-build/bin | grep -E '^n?vim'); \ if [ -z "$$vims" ]; then echo "No Vims found!"; exit 1; fi; \ EXIT=0; \ for vim in $$vims; do \ - $(DOCKER) $$vim '+Vader! test/*' || EXIT=$$?; \ + echo; \ + echo '========================================'; \ + echo "Running tests for $$vim"; \ + echo '========================================'; \ + echo; \ + docker run -a stderr $(DOCKER_FLAGS) $$vim '+Vader! test/*' || EXIT=$$?; \ done; \ - $(DOCKER) vint -s /testplugin || EXIT=$$?; \ + echo; \ + echo '========================================'; \ + echo 'Running Vint to lint our code'; \ + echo '========================================'; \ + echo 'Vint warnings/errors follow:'; \ + echo; \ + docker run -a stdout $(DOCKER_FLAGS) vint -s /testplugin | sed s:^/testplugin/:: || EXIT=$$?; \ + echo; \ + echo; \ exit $$EXIT; -.PHONY: test-setup test +.DEFAULT_GOAL := test diff --git a/plugin/ale.vim b/plugin/ale.vim index 58c7198..9b45cd7 100644 --- a/plugin/ale.vim +++ b/plugin/ale.vim @@ -26,7 +26,7 @@ endif let g:ale_buffer_loclist_map = {} let g:ale_buffer_should_reset_map = {} -let ale_buffer_sign_dummy_map = {} +let g:ale_buffer_sign_dummy_map = {} " User Configuration diff --git a/test/vimrc b/test/vimrc index ba65ebf..1ab04d0 100644 --- a/test/vimrc +++ b/test/vimrc @@ -2,7 +2,7 @@ " Load builtin plugins " We need this because run_vim.sh sets -i NONE -set runtimepath=/home/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,/home/vim/after +set runtimepath=/home/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,/testplugin set runtimepath+=/home/ale set runtimepath+=/vader