Commit 3b38626f authored by Mikio Hara's avatar Mikio Hara

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/9948Reviewed-by: 's avatarAlex Brainman <alex.brainman@gmail.com>
parent 6f7961da
...@@ -97,7 +97,7 @@ func printLeakedGoroutines() { ...@@ -97,7 +97,7 @@ func printLeakedGoroutines() {
if len(gss) == 0 { if len(gss) == 0 {
return return
} }
fmt.Fprintf(os.Stderr, "Leaked goroutines:\n") fmt.Fprintf(os.Stderr, "Running goroutines:\n")
for _, gs := range gss { for _, gs := range gss {
fmt.Fprintf(os.Stderr, "%v\n", gs) fmt.Fprintf(os.Stderr, "%v\n", gs)
} }
...@@ -130,7 +130,7 @@ func printLeakedSockets() { ...@@ -130,7 +130,7 @@ func printLeakedSockets() {
if len(sos) == 0 { if len(sos) == 0 {
return return
} }
fmt.Fprintf(os.Stderr, "Leaked sockets:\n") fmt.Fprintf(os.Stderr, "Inflight sockets:\n")
for s, so := range sos { for s, so := range sos {
fmt.Fprintf(os.Stderr, "%v: %v\n", s, so) fmt.Fprintf(os.Stderr, "%v: %v\n", s, so)
} }
......
...@@ -14,7 +14,8 @@ import ( ...@@ -14,7 +14,8 @@ import (
// testableNetwork reports whether network is testable on the current // testableNetwork reports whether network is testable on the current
// platform configuration. // platform configuration.
func testableNetwork(network string) bool { func testableNetwork(network string) bool {
switch ss := strings.Split(network, ":"); ss[0] { ss := strings.Split(network, ":")
switch ss[0] {
case "ip+nopriv": case "ip+nopriv":
switch runtime.GOOS { switch runtime.GOOS {
case "nacl": case "nacl":
...@@ -46,6 +47,16 @@ func testableNetwork(network string) bool { ...@@ -46,6 +47,16 @@ func testableNetwork(network string) bool {
return false return false
} }
} }
switch ss[0] {
case "tcp4", "udp4", "ip4":
if !supportsIPv4 {
return false
}
case "tcp6", "udp6", "ip6":
if !supportsIPv6 {
return false
}
}
return true return true
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment