]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: don't use a testlog if there is an exec command
authorIan Lance Taylor <iant@golang.org>
Wed, 13 Dec 2017 01:41:49 +0000 (17:41 -0800)
committerIan Lance Taylor <iant@golang.org>
Wed, 13 Dec 2017 02:00:48 +0000 (02:00 +0000)
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>
src/cmd/go/internal/test/test.go

index 4a9682c5855b3dadf988a670c82215696ee394d6..1cf1ba735193ee8cae4e409aec91d562560b01a5 100644 (file)
@@ -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.