mirror of
https://github.com/golang/go
synced 2024-10-04 06:31:22 -06: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:
parent
36013e4a22
commit
1b135172df
@ -181,7 +181,7 @@ var filePacketConnTests = []struct {
|
|||||||
|
|
||||||
func TestFilePacketConn(t *testing.T) {
|
func TestFilePacketConn(t *testing.T) {
|
||||||
switch runtime.GOOS {
|
switch runtime.GOOS {
|
||||||
case "plan9", "windows", "nacl":
|
case "nacl", "plan9", "windows":
|
||||||
t.Skipf("skipping test on %q", runtime.GOOS)
|
t.Skipf("skipping test on %q", runtime.GOOS)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,7 +24,6 @@ func newFileFD(f *os.File) (*netFD, error) {
|
|||||||
|
|
||||||
sotype, err := syscall.GetsockoptInt(fd, syscall.SOL_SOCKET, syscall.SO_TYPE)
|
sotype, err := syscall.GetsockoptInt(fd, syscall.SOL_SOCKET, syscall.SO_TYPE)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("getsockopt failed", fd, err.Error())
|
|
||||||
closesocket(fd)
|
closesocket(fd)
|
||||||
return nil, os.NewSyscallError("getsockopt", err)
|
return nil, os.NewSyscallError("getsockopt", err)
|
||||||
}
|
}
|
||||||
|
@ -247,7 +247,7 @@ var ipConnLocalNameTests = []struct {
|
|||||||
|
|
||||||
func TestIPConnLocalName(t *testing.T) {
|
func TestIPConnLocalName(t *testing.T) {
|
||||||
switch runtime.GOOS {
|
switch runtime.GOOS {
|
||||||
case "plan9", "windows", "nacl":
|
case "nacl", "plan9", "windows":
|
||||||
t.Skipf("skipping test on %q", runtime.GOOS)
|
t.Skipf("skipping test on %q", runtime.GOOS)
|
||||||
default:
|
default:
|
||||||
if os.Getuid() != 0 {
|
if os.Getuid() != 0 {
|
||||||
|
Loading…
Reference in New Issue
Block a user