From 63e29ad1f7b9b5a7f5d10b3c1beaf39a2e09e195 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 11 Dec 2017 11:28:50 -0800 Subject: [PATCH] cmd/go: don't pass -test.testlogfile on NaCl 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 Reviewed-by: Brad Fitzpatrick --- src/cmd/go/internal/test/test.go | 2 +- src/cmd/go/testdata/src/testcache/script.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 src/cmd/go/testdata/src/testcache/script.sh diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go index 4239677bdd..4a9682c585 100644 --- a/src/cmd/go/internal/test/test.go +++ b/src/cmd/go/internal/test/test.go @@ -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 index 0000000000..039e4d0069 --- /dev/null +++ b/src/cmd/go/testdata/src/testcache/script.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exit 0 -- 2.50.0