From: Elias Naur Date: Thu, 2 Jun 2016 13:42:14 +0000 (+0200) Subject: cmd/dist: skip an unsupported test on darwin/arm X-Git-Tag: go1.7beta2~73 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=14968bc1e52842b098408516472ebd3fb97e4714;p=gostls13.git cmd/dist: skip an unsupported test on darwin/arm Fixes the darwin/arm builder (I hope) Change-Id: I8a3502a1cdd468d4bf9a1c895754ada420b305ce Reviewed-on: https://go-review.googlesource.com/23684 Run-TryBot: Elias Naur Reviewed-by: David Crawshaw --- diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 0a384c73b2..e56d108ad4 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -728,7 +728,7 @@ func (t *tester) cgoTest(dt *distTest) error { cmd := t.addCmd(dt, "misc/cgo/test", "go", "test", t.tags(), "-ldflags", "-linkmode=auto", t.runFlag("")) cmd.Env = env - if t.gohostos != "dragonfly" && t.gohostarch != "ppc64le" && t.goos != "android" { + if t.gohostos != "dragonfly" && t.gohostarch != "ppc64le" && t.goos != "android" && (t.goos != "darwin" || t.goarch != "arm") { // linkmode=internal fails on dragonfly since errno is a TLS relocation. // linkmode=internal fails on ppc64le because cmd/link doesn't // handle the TOC correctly (issue 15409).