From a82f0fc303c5ff511b2550b775849abec30dbb3e Mon Sep 17 00:00:00 2001
From: Timo Beckers <timo@isovalent.com>
Date: Thu, 8 Jun 2023 11:53:49 +0200
Subject: [PATCH] Makefile: remove tparse -follow and -test.v from GOTEST_BASE

tparse -follow will echo all stdio generated during all tests, which gets
rather verbose in CI. Without -follow, tparse doesn't generate any output
until all tests have run, which causes Travis to abort the job after 10
minutes without interactivity.

tparse has recently gained the -progress option that emits PASS/FAIL lines
after each package finishes its tests. Use this instead of the overly
verbose -follow.

Signed-off-by: Timo Beckers <timo@isovalent.com>
---
 .travis/prepare.sh | 2 +-
 Makefile           | 2 +-
 Makefile.defs      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis/prepare.sh b/.travis/prepare.sh
index ade2640a6827f..73bd542302c88 100755
--- a/.travis/prepare.sh
+++ b/.travis/prepare.sh
@@ -46,4 +46,4 @@ install_clang
 export PATH="/usr/local/clang/bin:$PATH"
 
 go install github.com/mattn/goveralls@a36c7ef8f23b2952fa6e39663f52107dfc8ad69d # v0.0.11
-go install github.com/mfridman/tparse@a20c511a88b880dc2544d77d8bc2cc66a8dec507 # v0.10.3
+go install github.com/mfridman/tparse@28967170dce4f9f13de77ec857f7aed4c4294a5f # v0.12.3 (main) with -progress
diff --git a/Makefile b/Makefile
index 7a21c650483ac..3dcd3fa6c4593 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ TESTPKGS ?= ./...
 SWAGGER_VERSION := v0.30.3
 SWAGGER := $(CONTAINER_ENGINE) run -u $(shell id -u):$(shell id -g) --rm -v $(CURDIR):$(CURDIR) -w $(CURDIR) --entrypoint swagger quay.io/goswagger/swagger:$(SWAGGER_VERSION)
 
-GOTEST_BASE := -test.v -timeout 600s
+GOTEST_BASE := -timeout 600s
 GOTEST_COVER_OPTS += -coverprofile=coverage.out
 BENCH_EVAL := "."
 BENCH ?= $(BENCH_EVAL)
diff --git a/Makefile.defs b/Makefile.defs
index a9502f72915bc..8f38f4b1ce774 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -82,14 +82,14 @@ GO_TAGS_FLAGS = osusergo
 GOTEST_COVER_OPTS =
 
 # By default, just print go test output immediately to the terminal. If tparse
-# is installed, use it to format the output. This is either silent silent (V=0)
-# or gives some signal about ongoing progress by teeing to the terminal (V=1).
+# is installed, use it to format the output. Use -progress instead of -follow,
+# as the latter is too verbose for most of the test suite.
 GOTEST_FORMATTER ?= cat
 ifneq ($(shell command -v tparse),)
 	GOTEST_COVER_OPTS += -json
 	GOTEST_FORMATTER = tparse
 ifneq ($(V),0)
-	GOTEST_FORMATTER += -follow
+	GOTEST_FORMATTER += -progress
 endif
 endif