Skip to content

Commit d384ebd

Browse files
committed
net: enable multicast listener tests on solaris/illumos
It seems everything is in place for these tests to pass on solaris and illumos, so enable them. Fixes #7399 Change-Id: If6defb651ef9c5059c1aeccbc4fc13a12a86b682 Reviewed-on: https://go-review.googlesource.com/c/go/+/346149 Trust: Tobias Klauser <[email protected]> Trust: Damien Neil <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> Run-TryBot: Damien Neil <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Damien Neil <[email protected]>
1 parent 7622e41 commit d384ebd

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

src/net/listen_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,6 @@ func TestIPv4MulticastListener(t *testing.T) {
535535
switch runtime.GOOS {
536536
case "android", "plan9":
537537
t.Skipf("not supported on %s", runtime.GOOS)
538-
case "solaris", "illumos":
539-
t.Skipf("not supported on solaris or illumos, see golang.org/issue/7399")
540538
}
541539
if !supportsIPv4() {
542540
t.Skip("IPv4 is not supported")
@@ -610,8 +608,6 @@ func TestIPv6MulticastListener(t *testing.T) {
610608
switch runtime.GOOS {
611609
case "plan9":
612610
t.Skipf("not supported on %s", runtime.GOOS)
613-
case "solaris", "illumos":
614-
t.Skipf("not supported on solaris or illumos, see issue 7399")
615611
}
616612
if !supportsIPv6() {
617613
t.Skip("IPv6 is not supported")

src/net/sockoptip_stub.go

-6
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,25 @@ package net
1010
import "syscall"
1111

1212
func setIPv4MulticastInterface(fd *netFD, ifi *Interface) error {
13-
// See golang.org/issue/7399.
1413
return syscall.ENOPROTOOPT
1514
}
1615

1716
func setIPv4MulticastLoopback(fd *netFD, v bool) error {
18-
// See golang.org/issue/7399.
1917
return syscall.ENOPROTOOPT
2018
}
2119

2220
func joinIPv4Group(fd *netFD, ifi *Interface, ip IP) error {
23-
// See golang.org/issue/7399.
2421
return syscall.ENOPROTOOPT
2522
}
2623

2724
func setIPv6MulticastInterface(fd *netFD, ifi *Interface) error {
28-
// See golang.org/issue/7399.
2925
return syscall.ENOPROTOOPT
3026
}
3127

3228
func setIPv6MulticastLoopback(fd *netFD, v bool) error {
33-
// See golang.org/issue/7399.
3429
return syscall.ENOPROTOOPT
3530
}
3631

3732
func joinIPv6Group(fd *netFD, ifi *Interface, ip IP) error {
38-
// See golang.org/issue/7399.
3933
return syscall.ENOPROTOOPT
4034
}

0 commit comments

Comments
 (0)