diff --git a/coverage/Rules.mk b/coverage/Rules.mk index 336c56dbc12..fdd4f9af6be 100644 --- a/coverage/Rules.mk +++ b/coverage/Rules.mk @@ -3,10 +3,11 @@ include mk/header.mk $(d)/coverage_deps: $$(DEPS_GO) rm -rf $(@D)/unitcover && mkdir $(@D)/unitcover rm -rf $(@D)/sharnesscover && mkdir $(@D)/sharnesscover + ifneq ($(IPFS_SKIP_COVER_BINS),1) - go install github.com/Kubuxu/gocovmerge - go install golang.org/x/tools/cmd/cover +$(d)/coverage_deps: test/bin/gocovmerge endif + .PHONY: $(d)/coverage_deps # unit tests coverage diff --git a/coverage/tools.go b/coverage/tools.go deleted file mode 100644 index 50e1078d316..00000000000 --- a/coverage/tools.go +++ /dev/null @@ -1,8 +0,0 @@ -// +build tools - -package coverage - -import ( - _ "github.com/Kubuxu/gocovmerge" - _ "golang.org/x/tools/cmd/cover" -) diff --git a/go.mod b/go.mod index 7cea50c3cdc..8a504c4d389 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,6 @@ require ( github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c golang.org/x/sys v0.0.0-20190302025703-b6889370fb10 - golang.org/x/tools v0.0.0-20180221164845-07fd8470d635 gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect gopkg.in/cheggaaa/pb.v1 v1.0.28 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect diff --git a/mk/golang.mk b/mk/golang.mk index f8c53119ea4..563fef741c8 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -12,7 +12,6 @@ GOTFLAGS ?= # match Go's default GOPATH behaviour export GOPATH ?= $(shell $(GOCC) env GOPATH) -export GOBIN = $(abspath bin) DEPS_GO := TEST_GO := diff --git a/test/bin/Rules.mk b/test/bin/Rules.mk index 0105a2c67f4..7c2d0f20654 100644 --- a/test/bin/Rules.mk +++ b/test/bin/Rules.mk @@ -50,6 +50,10 @@ $(d)/random-files: $(call go-build,github.com/jbenet/go-random-files/random-files) TGTS_$(d) += $(d)/random-files +$(d)/gocovmerge: + $(call go-build,github.com/Kubuxu/gocovmerge) +TGTS_$(d) += $(d)/gocovmerge + $(TGTS_$(d)): $$(DEPS_GO) diff --git a/test/dependencies/dependencies.go b/test/dependencies/dependencies.go index cd3f9826885..8a9f737c857 100644 --- a/test/dependencies/dependencies.go +++ b/test/dependencies/dependencies.go @@ -3,6 +3,7 @@ package tools import ( + _ "github.com/Kubuxu/gocovmerge" _ "github.com/ipfs/go-cidutil/cid-fmt" _ "github.com/ipfs/hang-fds" _ "github.com/jbenet/go-random-files/random-files"