From d384ebde60a7e720f83fb10e6fa9cbf989a8866f Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 30 Aug 2021 16:00:53 +0200 Subject: [PATCH] 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 Trust: Damien Neil Run-TryBot: Tobias Klauser Run-TryBot: Damien Neil TryBot-Result: Go Bot Reviewed-by: Damien Neil --- src/net/listen_test.go | 4 ---- src/net/sockoptip_stub.go | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/net/listen_test.go b/src/net/listen_test.go index b1dce29ac20..50355de1ac0 100644 --- a/src/net/listen_test.go +++ b/src/net/listen_test.go @@ -535,8 +535,6 @@ func TestIPv4MulticastListener(t *testing.T) { switch runtime.GOOS { case "android", "plan9": t.Skipf("not supported on %s", runtime.GOOS) - case "solaris", "illumos": - t.Skipf("not supported on solaris or illumos, see golang.org/issue/7399") } if !supportsIPv4() { t.Skip("IPv4 is not supported") @@ -610,8 +608,6 @@ func TestIPv6MulticastListener(t *testing.T) { switch runtime.GOOS { case "plan9": t.Skipf("not supported on %s", runtime.GOOS) - case "solaris", "illumos": - t.Skipf("not supported on solaris or illumos, see issue 7399") } if !supportsIPv6() { t.Skip("IPv6 is not supported") diff --git a/src/net/sockoptip_stub.go b/src/net/sockoptip_stub.go index 4175922cec5..92349d88ba7 100644 --- a/src/net/sockoptip_stub.go +++ b/src/net/sockoptip_stub.go @@ -10,31 +10,25 @@ package net import "syscall" func setIPv4MulticastInterface(fd *netFD, ifi *Interface) error { - // See golang.org/issue/7399. return syscall.ENOPROTOOPT } func setIPv4MulticastLoopback(fd *netFD, v bool) error { - // See golang.org/issue/7399. return syscall.ENOPROTOOPT } func joinIPv4Group(fd *netFD, ifi *Interface, ip IP) error { - // See golang.org/issue/7399. return syscall.ENOPROTOOPT } func setIPv6MulticastInterface(fd *netFD, ifi *Interface) error { - // See golang.org/issue/7399. return syscall.ENOPROTOOPT } func setIPv6MulticastLoopback(fd *netFD, v bool) error { - // See golang.org/issue/7399. return syscall.ENOPROTOOPT } func joinIPv6Group(fd *netFD, ifi *Interface, ip IP) error { - // See golang.org/issue/7399. return syscall.ENOPROTOOPT }