1
0
mirror of https://github.com/golang/go synced 2024-11-23 16:30:06 -07:00

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>
This commit is contained in:
Ian Lance Taylor 2017-12-12 17:41:49 -08:00
parent 132b528e71
commit 1206e974a1

View File

@ -1265,11 +1265,12 @@ func (c *runCache) builderRunTest(b *work.Builder, a *work.Action) error {
return nil return nil
} }
execCmd := work.FindExecCmd()
testlogArg := []string{} testlogArg := []string{}
if !c.disableCache && cfg.Goos != "nacl" { if !c.disableCache && len(execCmd) == 0 {
testlogArg = []string{"-test.testlogfile=" + a.Objdir + "testlog.txt"} 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 != "" { if testCoverProfile != "" {
// Write coverage to temporary profile, for merging later. // Write coverage to temporary profile, for merging later.