This libgo patch is a backport of https://golang.org/cl/17154. It
fixes the tests for the net package to not run the multicast tests on
a nil interface when using -test.short, which is the default when
running make check. This should fix GCC PR 65785. Bootstrapped and
ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline and
GCC 5 branch.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 230694)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-b839c8c35af49bd6d86306ad34449654a4657cb1
+81dcb1ba4de82a6c9325cb322d5a832a6b1f168d
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/go/net/listen_test.go
===================================================================
--- libgo/go/net/listen_test.go (revision 230463)
+++ libgo/go/net/listen_test.go (working copy)
@@ -542,7 +542,7 @@ func TestIPv4MulticastListener(t *testin
// routing stuff for finding out an appropriate
// nexthop containing both network and link layer
// adjacencies.
- if ifi == nil && !*testExternal {
+ if ifi == nil && (testing.Short() || !*testExternal) {
continue
}
for _, tt := range ipv4MulticastListenerTests {
@@ -618,7 +618,7 @@ func TestIPv6MulticastListener(t *testin
// routing stuff for finding out an appropriate
// nexthop containing both network and link layer
// adjacencies.
- if ifi == nil && (!*testExternal || !*testIPv6) {
+ if ifi == nil && (testing.Short() || !*testExternal ||
!*testIPv6) {
continue
}
for _, tt := range ipv6MulticastListenerTests {
