]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: don't pass -test.testlogfile on NaCl
authorIan Lance Taylor <iant@golang.org>
Mon, 11 Dec 2017 19:28:50 +0000 (11:28 -0800)
committerIan Lance Taylor <iant@golang.org>
Mon, 11 Dec 2017 22:35:22 +0000 (22:35 +0000)
It causes every test to fail as the log file is on the local file system,
not the NaCl file system.

Updates #22593

Change-Id: Iee3d8307317bd792c9c701baa962ebbbfa34c147
Reviewed-on: https://go-review.googlesource.com/83256
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/cmd/go/internal/test/test.go
src/cmd/go/testdata/src/testcache/script.sh [new file with mode: 0755]

index 4239677bdd52e70bdcc8b03efb0d859f5f715b88..4a9682c5855b3dadf988a670c82215696ee394d6 100644 (file)
@@ -1266,7 +1266,7 @@ func (c *runCache) builderRunTest(b *work.Builder, a *work.Action) error {
        }
 
        testlogArg := []string{}
-       if !c.disableCache {
+       if !c.disableCache && cfg.Goos != "nacl" {
                testlogArg = []string{"-test.testlogfile=" + a.Objdir + "testlog.txt"}
        }
        args := str.StringList(work.FindExecCmd(), a.Deps[0].Target, testlogArg, testArgs)
diff --git a/src/cmd/go/testdata/src/testcache/script.sh b/src/cmd/go/testdata/src/testcache/script.sh
new file mode 100755 (executable)
index 0000000..039e4d0
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0