]> git.madduck.net Git - etc/vim.git/blobdiff - Makefile

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Use s:_skip_special_chars function
[etc/vim.git] / Makefile
index 5099a58c63adf1b6e48d5d863a1977bbc31f1fef..2566d411dc911a7a4aea9153cd0581122ccd4f7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,25 @@
 test:
        VIMRUNNER_REUSE_SERVER=1 xvfb-run bundle exec rspec
 
-test_slow:
-       VIMRUNNER_REUSE_SERVER=0 bundle exec rspec
+# Run tests in dockerized Vims.
+DOCKER_REPO:=blueyed/vim-python-pep8-indent-vims-for-test
+DOCKER_TAG:=3
+DOCKER_IMAGE:=$(DOCKER_REPO):$(DOCKER_TAG)
 
-test_visible:
-       VIMRUNNER_REUSE_SERVER=1 bundle exec rspec
+docker_image:
+       docker build -t $(DOCKER_REPO):$(DOCKER_TAG) .
+docker_push:
+       docker push $(DOCKER_REPO):$(DOCKER_TAG)
+docker_update_latest:
+       docker tag $(DOCKER_REPO):$(DOCKER_TAG) $(DOCKER_REPO):latest
+       docker push $(DOCKER_REPO):latest
+
+test_docker: XVFB_ERRORFILE:=/dev/null
+test_docker:
+       @set -x; export DISPLAY=$(if $(VIMRUNNER_TEST_DISPLAY),$(VIMRUNNER_TEST_DISPLAY),172.17.0.1:99; Xvfb -ac -listen tcp :99 >$(XVFB_ERRORFILE) 2>&1 & XVFB_PID=$$!); \
+         docker run --rm -ti -e DISPLAY -e VIMRUNNER_REUSE_SERVER=1 \
+         -v $(CURDIR):/vim-python-pep8-indent $(DOCKER_IMAGE) $(RSPEC_ARGS) \
+         $(if $(VIMRUNNER_TEST_DISPLAY),,; ret=$$?; kill $$XVFB_PID; exit $$ret)
+
+test_coverage:
+       spec/make-coverage