cmd/dist: enable more tests on macOS/ARM64

Unlike iOS, macOS ARM64 is more of a fully featured OS. Enable
more tests.

Updates #38485.

Change-Id: I2e2240c848d21996db2b950a4a6856987f7a652c
Reviewed-on: https://go-review.googlesource.com/c/go/+/256919
Trust: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index da894e3eefa96878cd7b49744ceff57a3d2e1663..abe496fdeed0515f5f5b63dba00db365901fe2ff 100644 (file)
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -903,7 +903,7 @@ func (t *tester) addCmd(dt *distTest, dir string, cmdline ...interface{}) *exec.
 }
 
 func (t *tester) iOS() bool {
-       return (goos == "darwin" || goos == "ios") && goarch == "arm64"
+       return goos == "ios"
 }
 
 func (t *tester) out(v string) {

diff --git a/test/fixedbugs/bug429_run.go b/test/fixedbugs/bug429_run.go
index c6a02aae5ef7409a375ce9cc4c3f885c78d04209..60cc5b62de8b6f91e27c127f011295ec5c545803 100644 (file)
--- a/test/fixedbugs/bug429_run.go
+++ b/test/fixedbugs/bug429_run.go
@@ -1,6 +1,11 @@
-// +build !nacl,!js
 // run
 
+// +build !nacl,!js
+// +build !darwin !arm64
+
+// Skip on darwin/arm64 as it requires external linking, which brings in
+// cgo, causing deadlock detection not working.
+
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

diff --git a/test/fixedbugs/issue21576.go b/test/fixedbugs/issue21576.go
index b7a32f07accddb98dfb1e90011caac9ec7a87326..3797a8c9ba531472ad4c2764963862f1ef85e5d7 100644 (file)
--- a/test/fixedbugs/issue21576.go
+++ b/test/fixedbugs/issue21576.go
@@ -1,6 +1,11 @@
-// +build !nacl,!js
 // run
 
+// +build !nacl,!js
+// +build !darwin !arm64
+
+// Skip on darwin/arm64 as it requires external linking, which brings in
+// cgo, causing deadlock detection not working.
+
 // Copyright 2019 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

diff --git a/test/nilptr.go b/test/nilptr.go
index 90f57c54b6c9cb844d021acffa01e3904f28a4d6..c9a044dd362edc713c838a864dd98b024cdbcff6 100644 (file)
--- a/test/nilptr.go
+++ b/test/nilptr.go
@@ -8,7 +8,8 @@
 // in a large address space.
 
 // +build !aix
-// Address space starts at 1<<32 on AIX, so dummy is too far.
+// +build !darwin !arm64
+// Address space starts at 1<<32 on AIX and on darwin/arm64, so dummy is too far.
 
 package main