From 43807e0f47e62fe5a33c3f0ebcaf9fafbb46b80d Mon Sep 17 00:00:00 2001
From: Hiroshi Ioka <hirochachacha@gmail.com>
Date: Sat, 9 Sep 2017 19:09:07 +0900
Subject: [PATCH] cmd/internal/goobj: skip tests on some $GOOS/arm

Updates #21817

Change-Id: I77ffaf8a7e54465a5b73691b896edcb20c29440f
Reviewed-on: https://go-review.googlesource.com/62351
Reviewed-by: David du Colombier <0intro@gmail.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---
 src/cmd/internal/goobj/goobj_test.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/cmd/internal/goobj/goobj_test.go b/src/cmd/internal/goobj/goobj_test.go
index 37fdcbb5cc..5375c4e712 100644
--- a/src/cmd/internal/goobj/goobj_test.go
+++ b/src/cmd/internal/goobj/goobj_test.go
@@ -27,8 +27,12 @@ func TestMain(m *testing.M) {
 		return
 	}
 
-	if runtime.GOOS == "linux" && runtime.GOARCH == "arm" {
-		return // skip tests due to #19811
+	if runtime.GOARCH == "arm" {
+		switch runtime.GOOS {
+		case "darwin", "android", "nacl":
+		default:
+			return // skip tests due to #19811
+		}
 	}
 
 	if err := buildGoobj(); err != nil {
-- 
2.50.0