runtime: skip crash test on android

LGTM=bradfitz
R=golang-codereviews, bradfitz, minux
CC=golang-codereviews
https://golang.org/cl/110400043

diff --git a/src/pkg/runtime/crash_test.go b/src/pkg/runtime/crash_test.go
index b0277f293cbd1de5ea215a8f75917df26503bc98..8552d2fe66755c85fc560c395ed8d3b710b956b5 100644 (file)
--- a/src/pkg/runtime/crash_test.go
+++ b/src/pkg/runtime/crash_test.go
@@ -32,8 +32,9 @@ func testEnv(cmd *exec.Cmd) *exec.Cmd {
 }
 
 func executeTest(t *testing.T, templ string, data interface{}) string {
-       if runtime.GOOS == "nacl" {
-               t.Skip("skipping on nacl")
+       switch runtime.GOOS {
+       case "android", "nacl":
+               t.Skipf("skipping on %s", runtime.GOOS)
        }
 
        checkStaleRuntime(t)

diff --git a/src/pkg/runtime/runtime_test.go b/src/pkg/runtime/runtime_test.go
index a726f500d101ee1f6cb7e857b1c0d226f04d229a..5e24e2570c9bebbe8f1d2ac5c3641f3fbd36540a 100644 (file)
--- a/src/pkg/runtime/runtime_test.go
+++ b/src/pkg/runtime/runtime_test.go
@@ -95,8 +95,9 @@ func BenchmarkDeferMany(b *testing.B) {
 // The value reported will include the padding between runtime.gogo and the
 // next function in memory. That's fine.
 func TestRuntimeGogoBytes(t *testing.T) {
-       if GOOS == "nacl" {
-               t.Skip("skipping on nacl")
+       switch GOOS {
+       case "android", "nacl":
+               t.Skipf("skipping on %s", GOOS)
        }
 
        dir, err := ioutil.TempDir("", "go-build")