[release-branch.go1.17] cmd/objdump: skip TestDisasm* on darwin-arm64

heschi · heschi · commit f7209f904d45 · 2022-05-10T15:33:47.000Z
The macOS 12 builders have an incompatible version of XCode installed. We fixed the bug on 1.18 but not 1.17. Updates #49700. Change-Id: Id356786aad351568ba6665430f093f5f78bb4357 Reviewed-on: https://go-review.googlesource.com/c/go/+/405474 Reviewed-by: David Chase <drchase@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go
@@ -106,6 +106,9 @@ var ppcGnuNeed = []string{
 }
 
 func mustHaveDisasm(t *testing.T) {
+	if strings.HasPrefix(testenv.Builder(), "darwin-arm64") {
+		t.Skipf("builder %q has an incompatible version of XCode installed, see go.dev/issue/49700", testenv.Builder())
+	}
 	switch runtime.GOARCH {
 	case "mips", "mipsle", "mips64", "mips64le":
 		t.Skipf("skipping on %s, issue 12559", runtime.GOARCH)

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ var ppcGnuNeed = []string{`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`func mustHaveDisasm(t *testing.T) {`
	`109`	`+ if strings.HasPrefix(testenv.Builder(), "darwin-arm64") {`
	`110`	`+ t.Skipf("builder %q has an incompatible version of XCode installed, see go.dev/issue/49700", testenv.Builder())`
	`111`	`+ }`
`109`	`112`	`switch runtime.GOARCH {`
`110`	`113`	`case "mips", "mipsle", "mips64", "mips64le":`
`111`	`114`	`t.Skipf("skipping on %s, issue 12559", runtime.GOARCH)`