1
0
mirror of https://github.com/golang/go synced 2024-11-23 16:40:03 -07:00

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
This commit is contained in:
Mikio Hara 2014-02-26 10:20:49 +09:00
parent 36013e4a22
commit 1b135172df
3 changed files with 2 additions and 3 deletions

View File

@ -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)
}

View File

@ -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)
}

View File

@ -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 {