runtime: skip tests that need fork on darwin/arm

Change-Id: I1bb0b8b11e8c7686b85657050fd7cf926afe4d29
Reviewed-on: https://go-review.googlesource.com/6200
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>

diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
index 7152b93195bd550556387f6acbaca1deeccbacfb..f3b69efe7500d90f9ec277a45aa3b56992c4616f 100644 (file)
--- a/src/runtime/crash_cgo_test.go
+++ b/src/runtime/crash_cgo_test.go
@@ -57,15 +57,17 @@ func TestCgoExternalThreadSIGPROF(t *testing.T) {
        case "plan9", "windows":
                t.Skipf("no pthreads on %s", runtime.GOOS)
        case "darwin":
-               // static constructor needs external linking, but we don't support
-               // external linking on OS X 10.6.
-               out, err := exec.Command("uname", "-r").Output()
-               if err != nil {
-                       t.Fatalf("uname -r failed: %v", err)
-               }
-               // OS X 10.6 == Darwin 10.x
-               if strings.HasPrefix(string(out), "10.") {
-                       t.Skipf("no external linking on OS X 10.6")
+               if runtime.GOARCH != "arm" {
+                       // static constructor needs external linking, but we don't support
+                       // external linking on OS X 10.6.
+                       out, err := exec.Command("uname", "-r").Output()
+                       if err != nil {
+                               t.Fatalf("uname -r failed: %v", err)
+                       }
+                       // OS X 10.6 == Darwin 10.x
+                       if strings.HasPrefix(string(out), "10.") {
+                               t.Skipf("no external linking on OS X 10.6")
+                       }
                }
        }
        if runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le" {

diff --git a/src/runtime/crash_test.go b/src/runtime/crash_test.go
index 715b2da232202e35565d99ad091f163808bf924d..5e26de36ac015c43a851b83a139162f602e43372 100644 (file)
--- a/src/runtime/crash_test.go
+++ b/src/runtime/crash_test.go
@@ -41,6 +41,10 @@ func executeTest(t *testing.T, templ string, data interface{}, extra ...string)
        switch runtime.GOOS {
        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)
+               }
        }
 
        checkStaleRuntime(t)