net: clean the dregs of NaCL merge

LGTM=iant, aram, dave
R=golang-codereviews, iant, aram, dave
CC=golang-codereviews
https://golang.org/cl/68770044

diff --git a/src/pkg/net/file_test.go b/src/pkg/net/file_test.go
index 09d1f4dcc0ad82464d2e4ae14f3633ecc30f6d60..d81bca78249472e4b001924604c64b84f7d5813d 100644 (file)
--- a/src/pkg/net/file_test.go
+++ b/src/pkg/net/file_test.go
@@ -181,7 +181,7 @@ var filePacketConnTests = []struct {
 
 func TestFilePacketConn(t *testing.T) {
        switch runtime.GOOS {
-       case "plan9", "windows", "nacl":
+       case "nacl", "plan9", "windows":
                t.Skipf("skipping test on %q", runtime.GOOS)
        }
 

diff --git a/src/pkg/net/file_unix.go b/src/pkg/net/file_unix.go
index c674b9b32013d827ef68728c7c52b305c997f954..07b3ecf62637f44d726a674109f9fa01696974b6 100644 (file)
--- a/src/pkg/net/file_unix.go
+++ b/src/pkg/net/file_unix.go
@@ -24,7 +24,6 @@ func newFileFD(f *os.File) (*netFD, error) {
 
        sotype, err := syscall.GetsockoptInt(fd, syscall.SOL_SOCKET, syscall.SO_TYPE)
        if err != nil {
-               println("getsockopt failed", fd, err.Error())
                closesocket(fd)
                return nil, os.NewSyscallError("getsockopt", err)
        }

diff --git a/src/pkg/net/ipraw_test.go b/src/pkg/net/ipraw_test.go
index 51a1b2c2fecd1a2127b52c2c50aa5e0ab71f049d..0632dafc65e642cfef1ab535386f224fb0600080 100644 (file)
--- a/src/pkg/net/ipraw_test.go
+++ b/src/pkg/net/ipraw_test.go
@@ -247,7 +247,7 @@ var ipConnLocalNameTests = []struct {
 
 func TestIPConnLocalName(t *testing.T) {
        switch runtime.GOOS {
-       case "plan9", "windows", "nacl":
+       case "nacl", "plan9", "windows":
                t.Skipf("skipping test on %q", runtime.GOOS)
        default:
                if os.Getuid() != 0 {