Commit 5ad83082 authored by David Crawshaw's avatar David Crawshaw

os/exec: skip fork test on darwin/arm64

Just like darwin/arm.

Change-Id: Ia8c912e91259a5073aa3ab2b6509a18aa9a1fce7
Reviewed-on: https://go-review.googlesource.com/8818Reviewed-by: default avatarMinux Ma <minux@golang.org>
parent 8c5f66bc
...@@ -27,10 +27,12 @@ import ( ...@@ -27,10 +27,12 @@ import (
"time" "time"
) )
// iOS cannot fork
var iOS = runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64")
func helperCommand(t *testing.T, s ...string) *exec.Cmd { func helperCommand(t *testing.T, s ...string) *exec.Cmd {
if runtime.GOOS == "nacl" || (runtime.GOOS == "darwin" && runtime.GOARCH == "arm") { if runtime.GOOS == "nacl" || iOS {
// iOS cannot fork t.Skipf("skipping on %s/%s, cannot fork", runtime.GOOS, runtime.GOARCH)
t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH)
} }
cs := []string{"-test.run=TestHelperProcess", "--"} cs := []string{"-test.run=TestHelperProcess", "--"}
cs = append(cs, s...) cs = append(cs, s...)
...@@ -50,8 +52,8 @@ func TestEcho(t *testing.T) { ...@@ -50,8 +52,8 @@ func TestEcho(t *testing.T) {
} }
func TestCommandRelativeName(t *testing.T) { func TestCommandRelativeName(t *testing.T) {
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm" { if iOS {
t.Skip("skipping on darwin/arm") t.Skip("skipping on darwin/%s, cannot fork", runtime.GOARCH)
} }
// Run our own binary as a relative path // Run our own binary as a relative path
...@@ -428,10 +430,9 @@ func TestExtraFiles(t *testing.T) { ...@@ -428,10 +430,9 @@ func TestExtraFiles(t *testing.T) {
switch runtime.GOOS { switch runtime.GOOS {
case "nacl", "windows": case "nacl", "windows":
t.Skipf("skipping test on %q", runtime.GOOS) t.Skipf("skipping test on %q", runtime.GOOS)
case "darwin": }
if runtime.GOARCH == "arm" { if iOS {
t.Skipf("skipping test on %s/%s", runtime.GOOS, runtime.GOARCH) t.Skipf("skipping test on %s/%s, cannot fork", runtime.GOOS, runtime.GOARCH)
}
} }
// Ensure that file descriptors have not already been leaked into // Ensure that file descriptors have not already been leaked into
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment