Commit 6a2bedb6 authored by Chris Bednarski's avatar Chris Bednarski

Merge pull request #2548 from mitchellh/makefile

Use go vet instead of go tool vet, and actually run it with make
parents 07eff4c0 e73ec1f7
TEST?=./... TEST?=./...
VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
-nilfunc -printf -rangeloops -shift -structtags -unsafeptr
default: test default: test vet dev
bin: bin:
@sh -c "$(CURDIR)/scripts/build.sh" @sh -c "$(CURDIR)/scripts/build.sh"
...@@ -41,10 +39,10 @@ updatedeps: ...@@ -41,10 +39,10 @@ updatedeps:
| xargs go get -f -u -v | xargs go get -f -u -v
vet: vet:
@go tool vet 2>/dev/null ; if [ $$? -eq 3 ]; then \ @go vet 2>/dev/null ; if [ $$? -eq 3 ]; then \
go get golang.org/x/tools/cmd/vet; \ go get golang.org/x/tools/cmd/vet; \
fi fi
@go tool vet $(VETARGS) . ; if [ $$? -eq 1 ]; then \ @go vet ./... ; if [ $$? -eq 1 ]; then \
echo ""; \ echo ""; \
echo "Vet found suspicious constructs. Please check the reported constructs"; \ echo "Vet found suspicious constructs. Please check the reported constructs"; \
echo "and fix them if necessary before submitting the code for reviewal."; \ echo "and fix them if necessary before submitting the code for reviewal."; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment