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 /gcc/go/gofrontend/MERGE | |
| 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 'gcc/go/gofrontend/MERGE')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 4097bab3073..d03d18eb37c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -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. |