From 0b3eb9fb8f33226711cef301246ca5510d1c6c0d Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 13 Feb 2018 23:21:29 +0100 Subject: [PATCH 1/5] Makefile: add docker_update_image --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 6882b5fb95..e465dd37e5 100644 --- a/Makefile +++ b/Makefile @@ -188,6 +188,14 @@ docker_image: docker build -f Dockerfile.tests -t $(DOCKER_REPO):$(DOCKER_TAG) . docker_push: docker push $(DOCKER_REPO):$(DOCKER_TAG) +docker_update_image: + git diff --cached --exit-code >/dev/null || { echo "Index is not clean."; exit 1 ; } + git diff --exit-code Makefile >/dev/null || { echo "Makefile is not clean."; exit 2 ; } + sed -i '/^DOCKER_TAG:=/s/:=.*/:=$(shell echo $$(($(DOCKER_TAG)+1)))/' Makefile + sed -i '/^ENV NEOMAKE_DOCKERFILE_UPDATE=/s/=.*/=$(shell date +%Y-%m-%d)/' Dockerfile.tests + make docker_image + make docker_test DOCKER_VIM=neovim-master + @echo "Done. Use 'make docker_push' to push it." DOCKER_VIMS:=vim73 vim74-trusty vim74-xenial vim8069 vim-master neovim-v0.1.7 neovim-v0.2.0 neovim-v0.2.1 neovim-v0.2.2 neovim-master _DOCKER_VIM_TARGETS:=$(addprefix docker_test-,$(DOCKER_VIMS)) From d44087b69c1b9a3a333f7fdd51e5c12fab0bfc35 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 13 Feb 2018 23:48:26 +0100 Subject: [PATCH 2/5] Update Docker base image for Alpine 3.7 --- .circleci/config.yml | 2 +- Dockerfile.tests | 4 ++-- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d07c2234bd..4c6d0eccac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 common: &common docker: - - image: neomake/vims-for-tests:19@sha256:91774f9a883c8ff950bb40232d84f5f3cec5dee7fad8cf7df3cd8af613342544 + - image: neomake/vims-for-tests:20@sha256:14859f9e4b73e13c716ac85dd05edb4dbd451e4870fc210a0529f6f603eaa3ee working_directory: ~/repo steps: - checkout diff --git a/Dockerfile.tests b/Dockerfile.tests index 49c3345996..bbf2435210 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -1,5 +1,5 @@ # From https://github.com/tweekmonster/vim-testbed. -FROM testbed/vim:6@sha256:107a7f57871202d75f6279d64b31a177a1022c5503fbe7f3b7951f88c1d18d3c +FROM testbed/vim:9@sha256:dc14380bb3d6a87790e4b6d4fc696a369258bd86b4a597dbe73c174cb7f0f5a8 # Currently tested versions: # - v7.3.429 (Ubuntu Precise, 12.04LTS) @@ -17,7 +17,7 @@ RUN install_vim -tag v7.3.429 -name vim73 --with-features=huge -build \ -tag neovim:v0.2.2 -py3 -build \ && rm -rf /vim-build/vim/vim/*/share/vim/*/tutor -ENV NEOMAKE_DOCKERFILE_UPDATE=2018-01-07 +ENV NEOMAKE_DOCKERFILE_UPDATE=2018-02-13 # Git master in a separate layer, since the above is meant to be stable. RUN install_vim -tag master -build \ diff --git a/Makefile b/Makefile index e465dd37e5..1b5041bb46 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,7 @@ vimhelplint: | $(if $(VIMHELPLINT_DIR),,build/vimhelplint) # Run tests in dockerized Vims. DOCKER_REPO:=neomake/vims-for-tests -DOCKER_TAG:=19 +DOCKER_TAG:=20 NEOMAKE_DOCKER_IMAGE?= DOCKER_IMAGE:=$(if $(NEOMAKE_DOCKER_IMAGE),$(NEOMAKE_DOCKER_IMAGE),$(DOCKER_REPO):$(DOCKER_TAG)) DOCKER_STREAMS:=-ti From 8771764f81e331ed2b737cea8026371a2c921ba0 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 14 Feb 2018 01:51:20 +0100 Subject: [PATCH 3/5] Update .coveragerc for fixes in coverage --- .coveragerc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index ef3684bf38..a8a186c0f8 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,6 @@ [run] plugins = covimerage data_file = .coverage.covimerage -include = autoload/*,plugin/*,tests/* +[report] +include = autoload/*,plugin/*,syntax/*,tests/* omit = tests/fixtures/vim/* From 066dae8b52ee38c2c53974b1b50a91e9e00ea2eb Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 14 Feb 2018 01:54:31 +0100 Subject: [PATCH 4/5] Makefile: fix coverage target --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1b5041bb46..3bd794c776 100644 --- a/Makefile +++ b/Makefile @@ -309,12 +309,10 @@ check: contrib/vim-checks $(LINT_ARGS) || (( ret+= 16 )); \ exit $$ret -build/coverage: $(shell find . -name '*.vim') +.coverage.covimerage: .coveragerc $(shell find . -name '*.vim') $(MAKE) testcoverage -.coverage: build/coverage - covimerage write_coverage $?/*.profile -coverage: .coverage - coverage report -m --skip-covered +coverage: .coverage.covimerage + coverage report -m clean: $(RM) -r build From 46ae686e5ab766e0f41eafbc721de9a6767945c7 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 14 Feb 2018 02:17:26 +0100 Subject: [PATCH 5/5] tests: cover syntax/neomake/python.vim --- tests/customqf.vader | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/customqf.vader b/tests/customqf.vader index 7cc93b28d7..adb4dc78b9 100644 --- a/tests/customqf.vader +++ b/tests/customqf.vader @@ -3,22 +3,27 @@ Include: include/setup.vader Execute (Displays custom formatted quickfix buffer): call neomake#quickfix#enable() try + new + let bufnr = bufnr('%') + noautocmd set filetype=python + Assert !hlexists('neomakePythonLint'), 'neomakePythonLint does not exist' + call setloclist(0, [{ \ 'lnum': 1, - \ 'bufnr': 1, - \ 'text': 'Line 1 nmcfg:{"name": "Alpha", "short": "Alph"}', + \ 'bufnr': bufnr, + \ 'text': 'Line 1 nmcfg:{"name": "python", "short": "Alph"}', \ }, \ { \ 'lnum': 2, \ 'col': 5, - \ 'bufnr': 1, + \ 'bufnr': bufnr, \ 'text': 'Line 2', \ }]) lopen let loclist_bufnr = bufnr('%') AssertEqual b:current_syntax, 'neomake_qf' - + Assert hlexists('neomakePythonLint'), 'neomakePythonLint does exists' AssertEqual getline(1, '$'), \ ['Alph 1:- Line 1', 'Alph 2:5 Line 2'] @@ -75,6 +80,7 @@ Execute (Displays custom formatted quickfix buffer): close finally call neomake#quickfix#disable() + bwipe endtry Execute (Sets quickfix title (location list)):