From 12cd1212714b587b798b7b88beb315cec8e0fe0d Mon Sep 17 00:00:00 2001 From: Stephen Waits Date: Sun, 15 Feb 2015 12:40:56 -0800 Subject: [PATCH] add coverage to Makefile (make cover) * also tweaked GOPATH as needed * re-vendored with cover tool included * ignore $/cover.out --- .hgignore | 3 ++- .../darwin_amd64/golang.org/x/tools/cover.a | Bin 0 -> 97334 bytes Makefile | 18 +++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .vendor/pkg/darwin_amd64/golang.org/x/tools/cover.a diff --git a/.hgignore b/.hgignore index 4e3c3f1..17b7297 100644 --- a/.hgignore +++ b/.hgignore @@ -1,2 +1,3 @@ syntax: glob -bin \ No newline at end of file +bin +cover.out \ No newline at end of file diff --git a/.vendor/pkg/darwin_amd64/golang.org/x/tools/cover.a b/.vendor/pkg/darwin_amd64/golang.org/x/tools/cover.a new file mode 100644 index 0000000000000000000000000000000000000000..6d8873487a33b2202def1f69e13f88a2927cc573 GIT binary patch literal 97334 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 literal 0 HcmV?d00001 diff --git a/Makefile b/Makefile index aefe125..6ab64a1 100644 --- a/Makefile +++ b/Makefile @@ -3,18 +3,19 @@ # derived from: http://zduck.com/2014/go-project-structure-and-dependencies/ # build targets (which aren't files) -.PHONY: build fmt lint vet test autotest run clean env vendor +.PHONY: build fmt lint vet test autotest cover run clean env vendor # configuration APPNAME := docrawler VENDOR := .vendor PACKAGES := \ golang.org/x/tools/cmd/vet \ + golang.org/x/tools/cmd/cover \ github.com/golang/lint/golint # override GOPATH to be our vendor directory -export GOPATH := ${PWD}/${VENDOR} -export PATH := ${PWD}/${VENDOR}/bin:${PATH} +export GOPATH := ${PWD}/${VENDOR}:${PWD} +export PATH := ${PWD}/${VENDOR}/bin:${PWD}/bin:${PATH} default: build @@ -35,24 +36,27 @@ test: autotest: fswatch -or ./src | \ - xargs -n1 -I{} ${SHELL} -c 'echo ; date ; echo ----------------------------; go test ./src/... | ./util/testfilter.sh' + xargs -n1 -I{} ${SHELL} -c 'echo ; date ; echo ----------------------------; go test ./src/... | ./util/testfilter.sh' + +cover: + go test -coverprofile cover.out ./src/... && go tool cover -html cover.out run: build ./bin/${APPNAME} clean: - rm -f ./bin/${APPNAME} + rm -f ./bin/${APPNAME} ./cover.out env: go env # vendor # * wipes our vendor directory completely -# * fetches all packages in ${PACKAGES} +# * fetches all packages in ${PACKAGES} (GOPATH hardcoded to vendor directory only) # * removes source control dirs so packages are vendorable (commitable) vendor: rm -dRf ./${VENDOR}/src && \ - go get -u ${PACKAGES} && \ + GOPATH=${PWD}/${VENDOR} go get -u ${PACKAGES} && \ rm -rf `find ./${VENDOR}/src -type d -name .git` && \ rm -rf `find ./${VENDOR}/src -type d -name .hg` && \ rm -rf `find ./${VENDOR}/src -type d -name .bzr` && \