From ae4cad3ff3d28d8f2f5cf8a7a29a9c9f3ce0e9b7 Mon Sep 17 00:00:00 2001 From: zramsay Date: Thu, 1 Jun 2017 13:51:03 -0400 Subject: [PATCH] make: use correct location for [test_go_megacheck] License: MIT Signed-off-by: Zach Ramsay --- Rules.mk | 8 +------- mk/golang.mk | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Rules.mk b/Rules.mk index d61ebb635..441e7ec4a 100644 --- a/Rules.mk +++ b/Rules.mk @@ -66,13 +66,6 @@ include $(dir)/Rules.mk # -------------------- # # core targets # # -------------------- # -PACKAGES_NOVENDOR := $(shell go list github.com/ipfs/go-ipfs/... | grep -v /Godeps/) - -megacheck: - @go get honnef.co/go/tools/cmd/megacheck - @for pkg in ${PACKAGES_NOVENDOR}; do megacheck "$$pkg"; done - -.PHONY: megacheck build: $(TGT_BIN) .PHONY: build @@ -149,6 +142,7 @@ help: @echo ' test_go_short' @echo ' test_go_expensive' @echo ' test_go_race' + @echo ' test_go_megacheck' - Run the `megacheck` vetting tool @echo ' test_sharness_short' @echo ' test_sharness_expensive' @echo ' test_sharness_race' diff --git a/mk/golang.mk b/mk/golang.mk index cf8b7e421..ada0c9771 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -13,6 +13,7 @@ CHECK_GO := go-pkg-name=$(shell go list $(go-tags) github.com/ipfs/go-ipfs/$(1)) go-main-name=$(notdir $(call go-pkg-name,$(1)))$(?exe) go-curr-pkg-tgt=$(d)/$(call go-main-name,$(d)) +go-pkgs-novendor=$(shell go list github.com/ipfs/go-ipfs/... | grep -v /Godeps/) go-tags=$(if $(GOTAGS), -tags="$(call join-with,$(space),$(GOTAGS))") go-flags-with-tags=$(GOFLAGS)$(go-tags) @@ -39,6 +40,11 @@ test_go_fmt: .PHONY: test_go_fmt TEST_GO += test_go_fmt +test_go_megacheck: + @go get honnef.co/go/tools/cmd/megacheck + @for pkg in $(go-pkgs-novendor); do megacheck "$$pkg"; done +.PHONY: megacheck + test_go: $(TEST_GO) check_go_version: