qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 07:04:43 -07:00
Code Releases Activity

net: treat android like linux in tests

Browse Source 
LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://golang.org/cl/112810043
This commit is contained in:
David Crawshaw 2014-07-08 13:41:18 -04:00
parent a31eeef7ff
commit 8b6dafa80e
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/net/conn_test.go
View File

@ -38,7 +38,7 @@ func TestConnAndListener(t *testing.T) {
}
case "unixpacket":
switch runtime.GOOS {
case "darwin", "nacl", "openbsd", "plan9", "windows":
case "android", "darwin", "nacl", "openbsd", "plan9", "windows":
continue
case "freebsd": // FreeBSD 8 doesn't support unixpacket
continue

2
src/pkg/net/multicast_test.go
View File

@ -25,7 +25,7 @@ var ipv4MulticastListenerTests = []struct {
// port.
func TestIPv4MulticastListener(t *testing.T) {
switch runtime.GOOS {
case "nacl", "plan9":
case "android", "nacl", "plan9":
t.Skipf("skipping test on %q", runtime.GOOS)
case "solaris":
t.Skipf("skipping test on solaris, see issue 7399")

4
src/pkg/net/parse_test.go
View File

@ -12,9 +12,9 @@ import (
)
func TestReadLine(t *testing.T) {
// /etc/services file does not exist on windows and Plan 9.
// /etc/services file does not exist on android, plan9, windows.
switch runtime.GOOS {
case "plan9", "windows":
case "android", "plan9", "windows":
t.Skipf("skipping test on %q", runtime.GOOS)
}
filename := "/etc/services" // a nice big file

15
src/pkg/net/unix_test.go
View File

@ -256,8 +256,11 @@ func TestUnixConnLocalAndRemoteNames(t *testing.T) {
t.Fatalf("UnixConn.Write failed: %v", err)
}
if runtime.GOOS == "linux" && laddr == "" {
laddr = "@" // autobind feature
switch runtime.GOOS {
case "android", "linux":
if laddr == "" {
laddr = "@" // autobind feature
}
}
var connAddrs = [3]struct{ got, want Addr }{
{ln.Addr(), ta},
@ -308,9 +311,13 @@ func TestUnixgramConnLocalAndRemoteNames(t *testing.T) {
}
}()
if runtime.GOOS == "linux" && laddr == "" {
laddr = "@" // autobind feature
switch runtime.GOOS {
case "android", "linux":
if laddr == "" {
laddr = "@" // autobind feature
}
}
var connAddrs = [4]struct{ got, want Addr }{
{c1.LocalAddr(), ta},
{c1.RemoteAddr(), nil},