]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/dist: skip an unsupported test on darwin/arm
authorElias Naur <elias.naur@gmail.com>
Thu, 2 Jun 2016 13:42:14 +0000 (15:42 +0200)
committerElias Naur <elias.naur@gmail.com>
Thu, 2 Jun 2016 14:02:07 +0000 (14:02 +0000)
Fixes the darwin/arm builder (I hope)

Change-Id: I8a3502a1cdd468d4bf9a1c895754ada420b305ce
Reviewed-on: https://go-review.googlesource.com/23684
Run-TryBot: Elias Naur <elias.naur@gmail.com>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
src/cmd/dist/test.go

index 0a384c73b29b79d166850b19f4a6297d5bf223f6..e56d108ad4cebc9cc2c9b957bfc2475b747a60e5 100644 (file)
@@ -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).