From 3b38626f7d5c9b85e3acb2601e34324879438fae Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Tue, 12 May 2015 23:11:28 +0900 Subject: [PATCH] net: don't run IP stack required tests on IP stack unimplemented kernels Fixes #10787. Change-Id: I35c96808a713dafb1f0fea301fa3f3528fe6a5bf Reviewed-on: https://go-review.googlesource.com/9948 Reviewed-by: Alex Brainman --- src/net/main_test.go | 4 ++-- src/net/platform_test.go | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/net/main_test.go b/src/net/main_test.go index a56b9cd5f9..4288e2add2 100644 --- a/src/net/main_test.go +++ b/src/net/main_test.go @@ -97,7 +97,7 @@ func printLeakedGoroutines() { if len(gss) == 0 { return } - fmt.Fprintf(os.Stderr, "Leaked goroutines:\n") + fmt.Fprintf(os.Stderr, "Running goroutines:\n") for _, gs := range gss { fmt.Fprintf(os.Stderr, "%v\n", gs) } @@ -130,7 +130,7 @@ func printLeakedSockets() { if len(sos) == 0 { return } - fmt.Fprintf(os.Stderr, "Leaked sockets:\n") + fmt.Fprintf(os.Stderr, "Inflight sockets:\n") for s, so := range sos { fmt.Fprintf(os.Stderr, "%v: %v\n", s, so) } diff --git a/src/net/platform_test.go b/src/net/platform_test.go index b700091dc5..d6248520f3 100644 --- a/src/net/platform_test.go +++ b/src/net/platform_test.go @@ -14,7 +14,8 @@ import ( // testableNetwork reports whether network is testable on the current // platform configuration. func testableNetwork(network string) bool { - switch ss := strings.Split(network, ":"); ss[0] { + ss := strings.Split(network, ":") + switch ss[0] { case "ip+nopriv": switch runtime.GOOS { case "nacl": @@ -46,6 +47,16 @@ func testableNetwork(network string) bool { return false } } + switch ss[0] { + case "tcp4", "udp4", "ip4": + if !supportsIPv4 { + return false + } + case "tcp6", "udp6", "ip6": + if !supportsIPv6 { + return false + } + } return true } -- 2.48.1