From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Tue, 26 May 2015 22:30:55 +0000 (+1200)
Subject: misc/cgo/testshared: do not capture output of go commands in verbose mode
X-Git-Tag: go1.5beta1~469
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9262e2183bd1a6d8489f0d597053af76194ede00;p=gostls13.git

misc/cgo/testshared: do not capture output of go commands in verbose mode

Change-Id: I8694ee5e5642c31815ae63cd414a3b1fcd9c95b0
Reviewed-on: https://go-review.googlesource.com/10411
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/misc/cgo/testshared/shared_test.go b/misc/cgo/testshared/shared_test.go
index fd577b03b5..c7f998c5c0 100644
--- a/misc/cgo/testshared/shared_test.go
+++ b/misc/cgo/testshared/shared_test.go
@@ -47,10 +47,17 @@ func goCmd(t *testing.T, args ...string) {
 	}
 	newargs = append(newargs, args[1:]...)
 	c := exec.Command("go", newargs...)
+	var output []byte
+	var err error
 	if testing.Verbose() {
 		fmt.Printf("+ go %s\n", strings.Join(newargs, " "))
+		c.Stdout = os.Stdout
+		c.Stderr = os.Stderr
+		err = c.Run()
+	} else {
+		output, err = c.CombinedOutput()
 	}
-	if output, err := c.CombinedOutput(); err != nil {
+	if err != nil {
 		if t != nil {
 			t.Errorf("executing %s failed %v:\n%s", strings.Join(c.Args, " "), err, output)
 		} else {