Improve the output of the tests, and fix the style issue again.

1 files changed, 18 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 5572ce7e..e8376deb 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