Add test_quick make target

Author: blueyed

Makefile

@@ -10,6 +10,9 @@ push:
 
 # test: build the base image and example image on top, running tests therein.
 DOCKER_BASE_IMAGE:=vim-testbed-base
-test:
+
+test test_quick:
 	docker build -t "$(DOCKER_BASE_IMAGE)" .
-	make -C example test
+	make -C example $<
+
+.PHONY: build push test test_quick

example/Dockerfile

@@ -1,7 +1,6 @@
 FROM testbed/vim
 
-RUN install_vim -tag v7.1 -name vim71 -build \
-                -tag v7.3.429 -name vim73 -py -build \
+RUN install_vim -tag v7.3.429 -name vim73 -py -build \
                 -tag v7.4.052 -name vim74-trusty -build \
                 -tag master -py2 -py3 -ruby -lua -build \
                 -tag neovim:v0.2.0 -py2 -py3 -ruby -build \

example/Dockerfile.quicktests

@@ -0,0 +1,4 @@
+# Dockerfile for quick tests.
+FROM vim-testbed-base
+
+RUN install_vim -tag v7.1 -name vim71 -build

example/Makefile

@@ -12,7 +12,11 @@ DOCKER = docker run -a stderr --rm \
 	-v $(WRITABLE_HOME):/home/vimtest \
 	-v $(CURDIR)/$(PLUGINS):/home/vimtest/plugins "$(IMAGE)"
 
-test: test-setup
+test_quick:
+	docker build -f Dockerfile.quicktests -t "$(IMAGE)" .
+	$(DOCKER) vim71 '+Vader! test/*'
+
+test: Dockerfile.tests $(PLUGINS)/vader.vim
 	docker build -f Dockerfile.tests -t "$(IMAGE)" .
 	set -ex; \
 	vims="$$(docker run --rm $(IMAGE) ls /vim-build/bin | grep vim)"; \
@@ -68,9 +72,6 @@ test: test-setup
 	  exit 1; \
 	fi;
 
-test-setup: Dockerfile.tests $(PLUGINS)/vader.vim
-	docker images -q $(IMAGE) || docker pull $(IMAGE)
-
 Dockerfile.tests: Dockerfile
 	( echo '# Autogenerated Dockerfile for tests.'; \
 	  echo '# Edit with care (generated from updates to Dockerfile).'; \
@@ -80,4 +81,4 @@ $(PLUGINS)/vader.vim:
 	mkdir -p $(PLUGINS)
 	cd $(PLUGINS) && git clone https://github.com/junegunn/vader.vim.git
 
-.PHONY: test-setup test
+.PHONY: test