From 059ada596ca5d510d1e1755b3b6dafa036195fb0 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Mon, 12 Sep 2016 11:36:02 -0700 Subject: [PATCH] cmd/dist: skip broken cgo race tests on darwin CL 26668 exposed #17065. Skip the cgo race tests on darwin for now. Updates #17065 Change-Id: I0ad0ce2ff1af6d515b8ce6184ddeabc49806950f Reviewed-on: https://go-review.googlesource.com/29077 Run-TryBot: Josh Bleecher Snyder TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor Reviewed-by: Brad Fitzpatrick --- src/cmd/dist/test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index a3c565967f..27341f2069 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -1016,7 +1016,8 @@ func (t *tester) raceTest(dt *distTest) error { // The race builder should catch any error here, but doesn't. // TODO(iant): Figure out how to catch this. // t.addCmd(dt, "src", "go", "test", "-race", "-run=TestParallelTest", "cmd/go") - if t.cgoEnabled { + // TODO: Remove t.goos != "darwin" when issue 17065 is fixed. + if t.cgoEnabled && t.goos != "darwin" { env := mergeEnvLists([]string{"GOTRACEBACK=2"}, os.Environ()) cmd := t.addCmd(dt, "misc/cgo/test", "go", "test", "-race", "-short", t.runFlag("")) cmd.Env = env -- 2.48.1