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 107de3e1cc033d146f3480083e7e04b5842d053a..36780d789de8623bfe815f16c4964346f3b17769 100644 (file)
--- 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)