From 99eb00bbdc7787c551996b14575fd981463a8435 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Fri, 23 Mar 2018 14:20:23 -0500 Subject: [PATCH] Remove obsolete coverage tools from Makefile Go 1.10 allows -coverprofile when testing multiple packages, so these hacks are no longer needed. --- Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8fdbcea3d..9eb2df7e6 100644 --- a/Makefile +++ b/Makefile @@ -40,20 +40,10 @@ test: vendor go test $(PKGS) $(TESTFLAGS) cover: vendor - mkdir -p build/coverage - echo "mode: set" > build/coverage/all.out - for pkg in $(PKGS) ; do \ - make cover-pkg PKG=$$pkg ; \ - done - -cover-pkg: - mkdir -p build/coverage - touch build/coverage/$(subst /,-,$(PKG)).out - go test -coverprofile=build/coverage/$(subst /,-,$(PKG)).out $(PKG) - tail -n +2 build/coverage/$(subst /,-,$(PKG)).out >> build/coverage/all.out + make test TESTFLAGS="-coverprofile=build/coverage.out" cover-viz: cover - go tool cover -html=build/coverage/all.out + go tool cover -html=build/coverage.out pilosa: vendor go build -tags release -ldflags $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosa