Update .travis.yml.

This commit is contained in:
Will Rouesnel 2017-06-07 00:25:54 +10:00
parent 8877b69804
commit 801793e185
2 changed files with 5 additions and 2 deletions

View File

@ -17,7 +17,7 @@ script:
- make all
- make docker
- make test-integration
- ./concatenate_coverage cover.out cover.test.out cover.integration.out
- make cover.out
- $HOME/gopath/bin/goveralls -coverprofile=cover.out -service=travis-ci
after_success:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS

View File

@ -48,11 +48,14 @@ test: tools
for pkg in $(GO_PKGS) ; do \
go test -v -covermode count -coverprofile=$(COVERDIR)/$$(echo $$pkg | tr '/' '-').out $$pkg ; \
done
gocovmerge $(shell find $(COVERDIR) -name '*.out') > cover.out
gocovmerge $(shell find $(COVERDIR) -name '*.out') > cover.test.out
test-integration: postgres_exporter postgres_exporter_integration_test
tests/test-smoke "$(shell pwd)/postgres_exporter" "$(shell pwd)/postgres_exporter_integration_test_script $(shell pwd)/postgres_exporter_integration_test $(shell pwd)/cover.integration.out"
cover.out: tools
gocovmerge cover.*.out > cover.out
# Do a self-contained docker build - we pull the official upstream container
# and do a self-contained build.
docker-build: