From be7090498b76ff50ec73858378ccf1670fec912f Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Thu, 26 Feb 2015 17:27:52 -0500 Subject: [PATCH] net/http/cgi: skip exec test on darwin/arm Change-Id: I2fc3cf94b465bf9d7ff8d7bf935b45e334b401e3 Reviewed-on: https://go-review.googlesource.com/6180 Reviewed-by: Hyang-Ah Hana Kim --- src/net/http/cgi/matryoshka_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/net/http/cgi/matryoshka_test.go b/src/net/http/cgi/matryoshka_test.go index 244acf1e8c..bf28c5625b 100644 --- a/src/net/http/cgi/matryoshka_test.go +++ b/src/net/http/cgi/matryoshka_test.go @@ -24,8 +24,8 @@ import ( // This test is a CGI host (testing host.go) that runs its own binary // as a child process testing the other half of CGI (child.go). func TestHostingOurselves(t *testing.T) { - if runtime.GOOS == "nacl" { - t.Skip("skipping on nacl") + if runtime.GOOS == "nacl" || (runtime.GOOS == "darwin" && runtime.GOARCH == "arm") { + t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) } h := &Handler{ @@ -93,8 +93,8 @@ func (w *limitWriter) Write(p []byte) (n int, err error) { // If there's an error copying the child's output to the parent, test // that we kill the child. func TestKillChildAfterCopyError(t *testing.T) { - if runtime.GOOS == "nacl" { - t.Skip("skipping on nacl") + if runtime.GOOS == "nacl" || (runtime.GOOS == "darwin" && runtime.GOARCH == "arm") { + t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) } defer func() { testHookStartProcess = nil }() @@ -140,8 +140,8 @@ func TestKillChildAfterCopyError(t *testing.T) { // Test that a child handler writing only headers works. // golang.org/issue/7196 func TestChildOnlyHeaders(t *testing.T) { - if runtime.GOOS == "nacl" { - t.Skip("skipping on nacl") + if runtime.GOOS == "nacl" || (runtime.GOOS == "darwin" && runtime.GOARCH == "arm") { + t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) } h := &Handler{ -- 2.48.1