aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-11-21 01:41:24 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-11-21 01:41:24 +0000
commiteaa7bc3388e1c620210b851f15b838045f4f0cca (patch)
tree4eec2b3965be5fa23bc7094e5e95599036697a4e /gcc/go
parentbbbe8b338b4e31ce315f97562906a013240bd621 (diff)
downloadgcc-eaa7bc3388e1c620210b851f15b838045f4f0cca.zip
gcc-eaa7bc3388e1c620210b851f15b838045f4f0cca.tar.gz
gcc-eaa7bc3388e1c620210b851f15b838045f4f0cca.tar.bz2
re PR go/65785 (libgo TestIPv4MulticastListener test fails on machine with no network connection)
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 From-SVN: r230695
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4097bab..d03d18eb 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.