From: David Crawshaw <crawshaw@golang.org>
Date: Wed, 4 Mar 2015 22:29:44 +0000 (-0500)
Subject: net: fix darwin/amd64 build
X-Git-Tag: go1.5beta1~1710
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5e49bfec92e04ca9eda715c8d61690ba5b47b9bf;p=gostls13.git

net: fix darwin/amd64 build

Accidental semantics change in 4c6364a87d4a.

Change-Id: I0bbfc441662d79af4dbac6f9fc4e3a485adfb924
Reviewed-on: https://go-review.googlesource.com/6831
Reviewed-by: Minux Ma <minux@golang.org>
---

diff --git a/src/net/server_test.go b/src/net/server_test.go
index e0768e67cf..c29468fda4 100644
--- a/src/net/server_test.go
+++ b/src/net/server_test.go
@@ -22,8 +22,10 @@ func skipServerTest(net, unixsotype, addr string, ipv6, ipv4map, linuxOnly bool)
 			return true
 		}
 	case "darwin":
-		if runtime.GOARCH == "arm" && net == unixsotype {
-			return true
+		if net == unixsotype {
+			if runtime.GOARCH == "arm" || linuxOnly {
+				return true
+			}
 		}
 	default:
 		if net == unixsotype && linuxOnly {