From 44aa04bf19a2228219c929e84cdf3ed4e10cdfd7 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 9 Oct 2016 00:32:44 +0200
Subject: [PATCH 1/2] Fix tests

---
 example/Dockerfile | 2 +-
 example/Makefile   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/example/Dockerfile b/example/Dockerfile
index b4b2523..3844548 100644
--- a/example/Dockerfile
+++ b/example/Dockerfile
@@ -4,4 +4,4 @@ RUN install_vim -name vim-precise -tag v7.3.429 -build \
                 -name vim-trusty -tag v7.4.052 -build \
                 -name vim-vivid -tag v7.4.488 -build \
                 -name vim-wily -tag v7.4.712 -build \
-                -name vim-xenial -tag v7.4.963 -build \
+                -name vim-xenial -tag v7.4.963 -build
diff --git a/example/Makefile b/example/Makefile
index 964d61b..967d57d 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -1,6 +1,6 @@
 IMAGE ?= tweekmonster/ubuntu-vims
 PLUGINS = test/plugins
-DOCKER = docker run -it --rm -v $(PWD):/testplugin -v $(PWD)/test:/home "$(IMAGE)"
+DOCKER = docker run -a stderr --rm -v $(PWD):/testplugin -v $(PWD)/test:/home "$(IMAGE)"
 
 $(PLUGINS)/vader.vim:
 	mkdir -p $(PLUGINS)
@@ -10,8 +10,10 @@ test-setup: $(PLUGINS)/vader.vim
 	docker images -q $(IMAGE) || docker pull $(IMAGE)
 
 test: test-setup
-	for vim in $$(docker run --rm $(IMAGE) ls /vim-build/bin | grep -E '^n?vim'); do \
-	  $(DOCKER) $$vim '+Vader! test/*'; \
+	vims=$$(docker run --rm $(IMAGE) ls /vim-build/bin | grep -E '^n?vim'); \
+	if [ -z "$$vims" ]; then echo "No Vims found!"; exit 1; fi; \
+	for vim in $$vims; do \
+	  $(DOCKER) $$vim '+Vader! /testplugin/test/*'; \
 	done
 
 .PHONY: test-setup test

From 0ea9eec4e21c5926de157f2f85f4f40a1585b8e6 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 9 Oct 2016 21:29:59 +0200
Subject: [PATCH 2/2] fixup! Fix tests

---
 example/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/Makefile b/example/Makefile
index 967d57d..5babd65 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -13,7 +13,7 @@ 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; \
 	for vim in $$vims; do \
-	  $(DOCKER) $$vim '+Vader! /testplugin/test/*'; \
+	  $(DOCKER) $$vim '+Vader! test/*'; \
 	done
 
 .PHONY: test-setup test