aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCherry Zhang <cherryyz@google.com>2020-09-17 12:39:43 -0400
committerCherry Zhang <cherryyz@google.com>2020-10-06 21:55:49 +0000
commit2e4ceaf963fc2a0ce95a198769012e62ec4e28ae (patch)
treed557ddd183e6ce09d50633205971e6f1edce456b /test
parenta739306ca7d9ea3a98acca59b853fe889f04c28c (diff)
downloadgo-2e4ceaf963fc2a0ce95a198769012e62ec4e28ae.tar.gz
go-2e4ceaf963fc2a0ce95a198769012e62ec4e28ae.zip
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>
Diffstat (limited to 'test')
-rw-r--r--test/fixedbugs/bug429_run.go7
-rw-r--r--test/fixedbugs/issue21576.go7
-rw-r--r--test/nilptr.go3
3 files changed, 14 insertions, 3 deletions
diff --git a/test/fixedbugs/bug429_run.go b/test/fixedbugs/bug429_run.go
index c6a02aae5e..60cc5b62de 100644
--- 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 b7a32f07ac..3797a8c9ba 100644
--- 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 90f57c54b6..c9a044dd36 100644
--- 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