diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Makefile | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 11adf95d..0426ead1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,4 @@ cache: pip install: | pip install vim-vint==0.3.9 script: | - EXIT=0 - vint -s || EXIT=$? - make test || EXIT=$? - exit $EXIT + make test @@ -5,9 +5,13 @@ RUN install_vim -tag v8.0.0000 -build \ ENV PACKAGES="\ git \ + python=2.7.12-r0 \ + py-pip=8.1.2-r0 \ " RUN apk --update add $PACKAGES && \ rm -rf /var/cache/apk/* /tmp/* /var/tmp/* +RUN pip install vim-vint==0.3.9 + RUN git clone https://github.com/junegunn/vader.vim vader && \ cd vader && git checkout c6243dd81c98350df4dec608fa972df98fa2a3af @@ -7,8 +7,11 @@ test-setup: 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/*'; \ - done + $(DOCKER) $$vim '+Vader! test/*' || EXIT=$$?; \ + done; \ + $(DOCKER) vint -s /testplugin || EXIT=$$?; \ + exit $$EXIT; .PHONY: test-setup test |