From 154e33d434e49657651e669956eac56c7d43e073 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 24 Jan 2019 16:42:23 +0100
Subject: [PATCH 1/3] build.make: clarify usage of "make V=1"

This may or may not work, depending on which packages have tests and
whether they contain glog.
---
 build.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.make b/build.make
index f07f25e84..010dcb946 100644
--- a/build.make
+++ b/build.make
@@ -51,6 +51,7 @@ IMAGE_TAGS+=$(shell tagged="$$(git describe --tags --match='v*' --abbrev=0)"; if
 IMAGE_NAME=$(REGISTRY_NAME)/$*
 
 ifdef V
+# Adding "-alsologtostderr" assumes that all test binaries contain glog. This is not guaranteed.
 TESTARGS = -v -args -alsologtostderr -v 5
 else
 TESTARGS =

From 147892c95429680cf2caa4a6ce32461fa50422d3 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 24 Jan 2019 16:43:24 +0100
Subject: [PATCH 2/3] build.make: support suppressing checks

Individual repos may have to filter out certain packages from
testing. For example, in csi-test the cmd/csi-sanity directory
contains a special test that depends on additional parameters that set
the CSI driver to test against.
---
 build.make | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.make b/build.make
index 010dcb946..dfc405e06 100644
--- a/build.make
+++ b/build.make
@@ -57,6 +57,9 @@ else
 TESTARGS =
 endif
 
+# Specific packages can be excluded from each of the tests below by setting the *_FILTER_CMD variables
+# to something like "| grep -v 'github.com/kubernetes-csi/project/pkg/foobar'". See usage below.
+
 build-%:
 	mkdir -p bin
 	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o ./bin/$* ./cmd/$*
@@ -95,19 +98,19 @@ test:
 test: test-go
 test-go:
 	@ echo; echo $@
-	go test `go list ./... | grep -v 'vendor'` $(TESTARGS)
+	go test `go list ./... | grep -v 'vendor' $(TEST_GO_FILTER_CMD)` $(TESTARGS)
 
 .PHONY: test-vet
 test: test-vet
 test-vet:
 	@ echo; echo $@
-	go vet `go list ./... | grep -v vendor`
+	go vet `go list ./... | grep -v vendor $(TEST_VET_FILTER_CMD)`
 
 .PHONY: test-fmt
 test: test-fmt
 test-fmt:
 	@ echo; echo $@
-	files=$$(find . -name '*.go' | grep -v './vendor'); \
+	files=$$(find . -name '*.go' | grep -v './vendor' $(TEST_FMT_FILTER_CMD)); \
 	if [ $$(gofmt -d $$files | wc -l) -ne 0 ]; then \
 		echo "formatting errors:"; \
 		gofmt -d $$files; \

From b0336b553c3770a34f67336a320ef8d1f77b28f8 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 25 Jan 2019 11:53:36 +0100
Subject: [PATCH 3/3] build.make: more readable "make test" output

The introduction for each individual test looked like an actual
command:

  test-subtree
  ./release-tools/verify-subtree.sh release-tools
  Directory 'release-tools' contains non-upstream changes:
  ...

It's better to make it look like a shell comment and increase its
visibility with a longer prefix:

  ### test-subtree:
  ./release-tools/verify-subtree.sh release-tools
  ...
---
 build.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.make b/build.make
index dfc405e06..4296ff47a 100644
--- a/build.make
+++ b/build.make
@@ -97,19 +97,19 @@ test:
 .PHONY: test-go
 test: test-go
 test-go:
-	@ echo; echo $@
+	@ echo; echo "### $@:"
 	go test `go list ./... | grep -v 'vendor' $(TEST_GO_FILTER_CMD)` $(TESTARGS)
 
 .PHONY: test-vet
 test: test-vet
 test-vet:
-	@ echo; echo $@
+	@ echo; echo "### $@:"
 	go vet `go list ./... | grep -v vendor $(TEST_VET_FILTER_CMD)`
 
 .PHONY: test-fmt
 test: test-fmt
 test-fmt:
-	@ echo; echo $@
+	@ echo; echo "### $@:"
 	files=$$(find . -name '*.go' | grep -v './vendor' $(TEST_FMT_FILTER_CMD)); \
 	if [ $$(gofmt -d $$files | wc -l) -ne 0 ]; then \
 		echo "formatting errors:"; \
@@ -120,5 +120,5 @@ test-fmt:
 .PHONY: test-subtree
 test: test-subtree
 test-subtree:
-	@ echo; echo $@
+	@ echo; echo "### $@:"
 	./release-tools/verify-subtree.sh release-tools