mirror of https://github.com/docker/docs.git
Do not run all the tests when testing yubikey hardware.
The tests take forever, since it *cannot* be parallelized at all, and there can only be one build at a time. Signed-off-by: Ying Li <ying.li@docker.com>
This commit is contained in:
parent
87cc809f18
commit
c583063014
7
Makefile
7
Makefile
|
@ -34,7 +34,7 @@ _space := $(empty) $(empty)
|
|||
COVERDIR=.cover
|
||||
COVERPROFILE?=$(COVERDIR)/cover.out
|
||||
COVERMODE=count
|
||||
PKGS = $(shell go list ./... | tr '\n' ' ')
|
||||
PKGS ?= $(shell go list ./... | tr '\n' ' ')
|
||||
|
||||
GO_VERSION = $(shell go version | awk '{print $$3}')
|
||||
|
||||
|
@ -124,7 +124,7 @@ endef
|
|||
gen-cover: go_version
|
||||
@mkdir -p "$(COVERDIR)"
|
||||
$(foreach PKG,$(PKGS),$(call gocover,$(PKG)))
|
||||
rm "$(COVERDIR)"/*testutils*.coverage.txt
|
||||
rm -f "$(COVERDIR)"/*testutils*.coverage.txt
|
||||
|
||||
# Generates the cover binaries and runs them all in serial, so this can be used
|
||||
# run all tests with a yubikey without any problems
|
||||
|
@ -140,6 +140,9 @@ ci: OPTS = -tags "${NOTARY_BUILDTAGS}" -race -coverpkg "$(shell ./coverpkg.sh $(
|
|||
# Codecov knows how to merge multiple coverage files, so covmerge is not needed
|
||||
ci: gen-cover
|
||||
|
||||
yubikey-tests: override PKGS = github.com/docker/notary/cmd/notary github.com/docker/notary/trustmanager/yubikey
|
||||
yubikey-tests: ci
|
||||
|
||||
covmerge:
|
||||
@gocovmerge $(shell ls -1 $(COVERDIR)/* | tr "\n" " ") > $(COVERPROFILE)
|
||||
@go tool cover -func="$(COVERPROFILE)"
|
||||
|
|
|
@ -18,8 +18,6 @@ machine:
|
|||
CIRCLE_PAIN: "mode: set"
|
||||
# Put the coverage profile somewhere codecov's script can find it
|
||||
COVERPROFILE: coverage.out
|
||||
# Set the pull request number so codecov can figure it out
|
||||
PULL_REQUEST: ${CI_PULL_REQUEST##*/}
|
||||
|
||||
hosts:
|
||||
# Not used yet
|
||||
|
|
Loading…
Reference in New Issue