From 9262e2183bd1a6d8489f0d597053af76194ede00 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 27 May 2015 10:30:55 +1200 Subject: [PATCH] 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 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot --- misc/cgo/testshared/shared_test.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 { -- 2.48.1