]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: skip fork test on darwin/arm64
authorDavid Crawshaw <crawshaw@golang.org>
Sat, 11 Apr 2015 23:00:53 +0000 (19:00 -0400)
committerDavid Crawshaw <crawshaw@golang.org>
Mon, 13 Apr 2015 11:52:05 +0000 (11:52 +0000)
Just like darwin/arm.

Change-Id: Ie4998d24b2d891a9f6c8047ec40cd3fdf80622cd
Reviewed-on: https://go-review.googlesource.com/8812
Reviewed-by: Minux Ma <minux@golang.org>
src/runtime/crash_cgo_test.go
src/runtime/crash_test.go
src/runtime/runtime_test.go

index 01ffed93db7da4ef8f8e9e9e7677edff7d6827a8..6c6576ab904044a238b4e432536f9728a3bd0f20 100644 (file)
@@ -57,7 +57,7 @@ func TestCgoExternalThreadSIGPROF(t *testing.T) {
        case "plan9", "windows":
                t.Skipf("no pthreads on %s", runtime.GOOS)
        case "darwin":
-               if runtime.GOARCH != "arm" {
+               if runtime.GOARCH != "arm" && runtime.GOARCH != "arm64" {
                        // static constructor needs external linking, but we don't support
                        // external linking on OS X 10.6.
                        out, err := exec.Command("uname", "-r").Output()
index 7bb3d288712685b756e77578978e486656892aa8..975defdb604a29410f9294ec03d51f3a9dc0e8d2 100644 (file)
@@ -42,8 +42,9 @@ func executeTest(t *testing.T, templ string, data interface{}, extra ...string)
        case "android", "nacl":
                t.Skipf("skipping on %s", runtime.GOOS)
        case "darwin":
-               if runtime.GOARCH == "arm" {
-                       t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH)
+               switch runtime.GOARCH {
+               case "arm", "arm64":
+                       t.Skipf("skipping on %s/%s, no fork", runtime.GOOS, runtime.GOARCH)
                }
        }
 
index 782b936548f876b861724b05ecfd0cd4a9e0ead2..d4cccbf0840b3aa5c4a4e78f8ce910234ab2e41b 100644 (file)
@@ -99,8 +99,9 @@ func TestRuntimeGogoBytes(t *testing.T) {
        case "android", "nacl":
                t.Skipf("skipping on %s", GOOS)
        case "darwin":
-               if GOARCH == "arm" {
-                       t.Skipf("skipping on %s/%s", GOOS, GOARCH)
+               switch GOARCH {
+               case "arm", "arm64":
+                       t.Skipf("skipping on %s/%s, no fork", GOOS, GOARCH)
                }
        }