From 4dbe9379a9c307194a5387e9851a35b7c496c6d6 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Wed, 7 Aug 2019 21:33:06 -0700 Subject: [PATCH] Makefile: ensure submodules are linted, covered, and tested --- Makefile | 4 ++-- make/testing_flags.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5f85ac74..c5b0489a 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,8 @@ GOINSTALL := GO111MODULE=on go install -v GOTEST := GO111MODULE=on go test -v GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*") -GOLIST := go list $(PKG)/... | grep -v '/vendor/' -GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./') +GOLIST := go list -deps $(PKG)/... | grep '$(PKG)'| grep -v '/vendor/' +GOLISTCOVER := $(shell go list -deps -f '{{.ImportPath}}' ./... | grep '$(PKG)' | sed -e 's/^$(ESCPKG)/./') RM := rm -f CP := cp diff --git a/make/testing_flags.mk b/make/testing_flags.mk index 5105d190..63d88ad6 100644 --- a/make/testing_flags.mk +++ b/make/testing_flags.mk @@ -1,7 +1,7 @@ DEV_TAGS = dev LOG_TAGS = TEST_FLAGS = -COVER_PKG = $$(go list ./... | grep -v lnrpc) +COVER_PKG = $$(go list -deps ./... | grep '$(PKG)' | grep -v lnrpc) # If specific package is being unit tested, construct the full name of the # subpackage.