diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-21 01:41:24 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-21 01:41:24 +0000 |
| commit | dc11b5a80b5e5a4cba5d611c319575a809f99535 (patch) | |
| tree | 4eec2b3965be5fa23bc7094e5e95599036697a4e /libgo | |
| parent | 2b19d6878472189bbd622199ca90f23fb7f5129d (diff) | |
| download | gcc-dc11b5a80b5e5a4cba5d611c319575a809f99535.tar.gz | |
PR go/65785
net: don't run multicast listen test on nil interface in short mode
This is a backport of https://golang.org/cl/17154.
The gccgo bug report https://gcc.gnu.org/PR65785 points out that the
multicast listen tests will use the network even with -test.short.
Fix test by checking testing.Short with a nil interface.
Reviewed-on: https://go-review.googlesource.com/17158
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230695 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/net/listen_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/net/listen_test.go b/libgo/go/net/listen_test.go index d5627f2556d..51ffe672388 100644 --- a/libgo/go/net/listen_test.go +++ b/libgo/go/net/listen_test.go @@ -542,7 +542,7 @@ func TestIPv4MulticastListener(t *testing.T) { // 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 *testing.T) { // 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 { |