From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 13 Dec 2017 01:41:49 +0000 (-0800)
Subject: cmd/go: don't use a testlog if there is an exec command
X-Git-Tag: go1.10beta2~127
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1206e974a1a6f1132c6ea5d746763a841d2d293a;p=gostls13.git

cmd/go: don't use a testlog if there is an exec command

An exec command is normally used on platforms were the test is run in
some unusual way, making it less likely that the testlog will be useful.

Updates #22593

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

diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go
index 4a9682c585..1cf1ba7351 100644
--- a/src/cmd/go/internal/test/test.go
+++ b/src/cmd/go/internal/test/test.go
@@ -1265,11 +1265,12 @@ func (c *runCache) builderRunTest(b *work.Builder, a *work.Action) error {
 		return nil
 	}
 
+	execCmd := work.FindExecCmd()
 	testlogArg := []string{}
-	if !c.disableCache && cfg.Goos != "nacl" {
+	if !c.disableCache && len(execCmd) == 0 {
 		testlogArg = []string{"-test.testlogfile=" + a.Objdir + "testlog.txt"}
 	}
-	args := str.StringList(work.FindExecCmd(), a.Deps[0].Target, testlogArg, testArgs)
+	args := str.StringList(execCmd, a.Deps[0].Target, testlogArg, testArgs)
 
 	if testCoverProfile != "" {
 		// Write coverage to temporary profile, for merging later.