flow: Merged <feature> 'add_test_coverage' to <develop> ('develop').

This commit is contained in:
swaits committed 2015-02-15 12:41:02 -08:00
commit d8b47abf6e
3 files changed
+11 -6

No files matched your search

+1
View File
@@ -1,2 +1,3 @@
syntax: glob syntax: glob
bin bin
cover.out
Binary file not shown.
+10 -6
View File
@@ -3,18 +3,19 @@
# derived from: http://zduck.com/2014/go-project-structure-and-dependencies/ # derived from: http://zduck.com/2014/go-project-structure-and-dependencies/
# build targets (which aren't files) # 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 # configuration
APPNAME := docrawler APPNAME := docrawler
VENDOR := .vendor VENDOR := .vendor
PACKAGES := \ PACKAGES := \
golang.org/x/tools/cmd/vet \ golang.org/x/tools/cmd/vet \
golang.org/x/tools/cmd/cover \
github.com/golang/lint/golint github.com/golang/lint/golint
# override GOPATH to be our vendor directory # override GOPATH to be our vendor directory
export GOPATH := ${PWD}/${VENDOR} export GOPATH := ${PWD}/${VENDOR}:${PWD}
export PATH := ${PWD}/${VENDOR}/bin:${PATH} export PATH := ${PWD}/${VENDOR}/bin:${PWD}/bin:${PATH}
default: build default: build
@@ -37,22 +38,25 @@ autotest:
fswatch -or ./src | \ 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 run: build
./bin/${APPNAME} ./bin/${APPNAME}
clean: clean:
rm -f ./bin/${APPNAME} rm -f ./bin/${APPNAME} ./cover.out
env: env:
go env go env
# vendor # vendor
# * wipes our vendor directory completely # * 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) # * removes source control dirs so packages are vendorable (commitable)
vendor: vendor:
rm -dRf ./${VENDOR}/src && \ 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 .git` && \
rm -rf `find ./${VENDOR}/src -type d -name .hg` && \ rm -rf `find ./${VENDOR}/src -type d -name .hg` && \
rm -rf `find ./${VENDOR}/src -type d -name .bzr` && \ rm -rf `find ./${VENDOR}/src -type d -name .bzr` && \