code review 112810043: net: treat android like linux in tests

net: treat android like linux in tests

[crawshaw, 2014-07-08 14:46:47]

Hello golang-codereviews@googlegroups.com (cc:
golang-codereviews@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2014-07-08 16:30:59]

LGTM



On Tue, Jul 8, 2014 at 7:46 AM, <crawshaw@golang.org> wrote:

> Reviewers: golang-codereviews,
>
> Message:
> Hello golang-codereviews@googlegroups.com (cc:
> golang-codereviews@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> net: treat android like linux in tests
>
> Please review this at https://codereview.appspot.com/112810043/
>
> Affected files (+15, -8 lines):
>   M src/pkg/net/conn_test.go
>   M src/pkg/net/multicast_test.go
>   M src/pkg/net/parse_test.go
>   M src/pkg/net/unix_test.go
>
>
> Index: src/pkg/net/conn_test.go
> ===================================================================
> --- a/src/pkg/net/conn_test.go
> +++ b/src/pkg/net/conn_test.go
> @@ -38,7 +38,7 @@
>                         }
>                 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
> Index: src/pkg/net/multicast_test.go
> ===================================================================
> --- a/src/pkg/net/multicast_test.go
> +++ b/src/pkg/net/multicast_test.go
> @@ -25,7 +25,7 @@
>  // 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")
> Index: src/pkg/net/parse_test.go
> ===================================================================
> --- a/src/pkg/net/parse_test.go
> +++ b/src/pkg/net/parse_test.go
> @@ -12,9 +12,9 @@
>  )
>
>  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
> Index: src/pkg/net/unix_test.go
> ===================================================================
> --- a/src/pkg/net/unix_test.go
> +++ b/src/pkg/net/unix_test.go
> @@ -256,8 +256,11 @@
>                         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 @@
>                         }
>                 }()
>
> -               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},
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[crawshaw, 2014-07-08 17:41:28]

*** Submitted as https://code.google.com/p/go/source/detail?r=27eb9d18b77c ***

net: treat android like linux in tests

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/112810043

[gobot, 2014-07-08 18:00:34]

This CL appears to have broken the windows-386 builder.
See http://build.golang.org/log/b62f1aa591a5aacb8a11a8631cf161d8e00f40c1

[crawshaw, 2014-07-08 18:07:32]

Unrelated.

On Tue, Jul 8, 2014 at 2:00 PM,  <gobot@golang.org> wrote:
> This CL appears to have broken the windows-386 builder.
> See http://build.golang.org/log/b62f1aa591a5aacb8a11a8631cf161d8e00f40c1
>
> https://codereview.appspot.com/112810043/