From 71597bd1adfb016a3ea1977068c37dce92d49458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Mon, 25 Nov 2019 11:26:47 +0100
Subject: [PATCH] mage: Restore -v behaviour

---
 magefile.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/magefile.go b/magefile.go
index 6fcf17b13..a888fb78d 100644
--- a/magefile.go
+++ b/magefile.go
@@ -159,31 +159,19 @@ func testGoFlags() string {
 // Note that we don't run with the extended tag. Currently not supported in 32 bit.
 func Test386() error {
 	env := map[string]string{"GOARCH": "386", "GOFLAGS": testGoFlags()}
-	output, err := sh.OutputWith(env, goexe, "test", "./...")
-	if err != nil {
-		fmt.Printf(output)
-	}
-	return err
+	return runCmd(env, goexe, "test", "./...")
 }
 
 // Run tests
 func Test() error {
 	env := map[string]string{"GOFLAGS": testGoFlags()}
-	output, err := sh.OutputWith(env, goexe, "test", "./...", "-tags", buildTags())
-	if err != nil {
-		fmt.Printf(output)
-	}
-	return err
+	return runCmd(env, goexe, "test", "./...", "-tags", buildTags())
 }
 
 // Run tests with race detector
 func TestRace() error {
 	env := map[string]string{"GOFLAGS": testGoFlags()}
-	output, err := sh.OutputWith(env, goexe, "test", "-race", "./...", "-tags", buildTags())
-	if err != nil {
-		fmt.Printf(output)
-	}
-	return err
+	return runCmd(env, goexe, "test", "-race", "./...", "-tags", buildTags())
 }
 
 // Run gofmt linter
@@ -319,6 +307,18 @@ func TestCoverHTML() error {
 	return sh.Run(goexe, "tool", "cover", "-html="+coverAll)
 }
 
+func runCmd(env map[string]string, cmd string, args ...string) error {
+	if mg.Verbose() {
+		return sh.RunWith(env, cmd, args...)
+	}
+	output, err := sh.OutputWith(env, cmd, args...)
+	if err != nil {
+		fmt.Fprint(os.Stderr, output)
+	}
+
+	return err
+}
+
 func isGoLatest() bool {
 	return strings.Contains(runtime.Version(), "1.12")
 }