From: Russ Cox <rsc@golang.org>
Date: Tue, 31 May 2011 20:15:23 +0000 (-0400)
Subject: net: stop Mac popups
X-Git-Tag: weekly.2011-06-02~42
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4706ce309f9176f7726f824fe88ebae79ccda6e2;p=gostls13.git

net: stop Mac popups

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/4559059
---

diff --git a/src/pkg/net/server_test.go b/src/pkg/net/server_test.go
index 107de3e1cc..36780d789d 100644
--- a/src/pkg/net/server_test.go
+++ b/src/pkg/net/server_test.go
@@ -92,10 +92,13 @@ func connect(t *testing.T, network, addr string, isEmpty bool) {
 }
 
 func doTest(t *testing.T, network, listenaddr, dialaddr string) {
-	if listenaddr == "" {
-		t.Logf("Test %s %s %s\n", network, "<nil>", dialaddr)
-	} else {
-		t.Logf("Test %s %s %s\n", network, listenaddr, dialaddr)
+	t.Logf("Test %q %q %q\n", network, listenaddr, dialaddr)
+	switch listenaddr {
+	case "", "0.0.0.0", "[::]", "[::ffff:0.0.0.0]":
+		if testing.Short() || avoidMacFirewall {
+			t.Logf("skip wildcard listen during short test")
+			return
+		}
 	}
 	listening := make(chan string)
 	done := make(chan int)