diff options
| author | Russ Cox <rsc@golang.org> | 2015-06-05 11:01:53 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-06-16 18:07:36 +0000 |
| commit | 7bc3e5880675ce4aae245f46d193924cff5efdfb (patch) | |
| tree | bc5991015f83aa4852edaf31b096fc968c3f6369 /src/syscall | |
| parent | 047f07a285edbc60f64018973be7ce6b341fe22d (diff) | |
| download | go-7bc3e5880675ce4aae245f46d193924cff5efdfb.tar.xz | |
all: extract "can I exec?" check from tests into internal/testenv
Change-Id: I7b54be9d8b50b39e01c6be21f310ae9a10404e9d
Reviewed-on: https://go-review.googlesource.com/10753
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/syscall')
| -rw-r--r-- | src/syscall/exec_unix_test.go | 7 | ||||
| -rw-r--r-- | src/syscall/syscall_unix_test.go | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/syscall/exec_unix_test.go b/src/syscall/exec_unix_test.go index ff8261111e..9bb95c0f39 100644 --- a/src/syscall/exec_unix_test.go +++ b/src/syscall/exec_unix_test.go @@ -7,11 +7,11 @@ package syscall_test import ( + "internal/testenv" "io" "os" "os/exec" "os/signal" - "runtime" "syscall" "testing" "unsafe" @@ -48,9 +48,8 @@ func (c *command) Stop() { } func create(t *testing.T) *command { - if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") { - t.Skipf("skipping on %s/%s, cannot fork", runtime.GOOS, runtime.GOARCH) - } + testenv.MustHaveExec(t) + proc := exec.Command("cat") stdin, err := proc.StdinPipe() if err != nil { diff --git a/src/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go index af92013739..6895458165 100644 --- a/src/syscall/syscall_unix_test.go +++ b/src/syscall/syscall_unix_test.go @@ -9,6 +9,7 @@ package syscall_test import ( "flag" "fmt" + "internal/testenv" "io/ioutil" "net" "os" @@ -130,12 +131,10 @@ func TestPassFD(t *testing.T) { case "solaris": // TODO(aram): Figure out why ReadMsgUnix is returning empty message. t.Skip("skipping test on solaris, see issue 7402") - case "darwin": - switch runtime.GOARCH { - case "arm", "arm64": - t.Skipf("skipping test on %d/%s, no fork", runtime.GOOS, runtime.GOARCH) - } } + + testenv.MustHaveExec(t) + if os.Getenv("GO_WANT_HELPER_PROCESS") == "1" { passFDChild() return |