[Pkg-golang-commits] [golang] 02/02: Backport test skipping change from go1.6 for multicast listen in short mode (Closes: #814849)

[Tianon Gravi]

This is an automated email from the git hooks/post-receive script.

tianon pushed a commit to branch debian-sid
in repository golang.

commit 7ad4e5dc97b1f296e982e69f8569a7c3a2dcfca0
Author: Tianon Gravi <tianon at debian.org>
Date:   Mon Feb 15 15:24:55 2016 -0800

    Backport test skipping change from go1.6 for multicast listen in short mode (Closes: #814849)
---
 debian/changelog              |  2 ++
 debian/patches/cl-17154.patch | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c67a872..315901a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ golang (2:1.5.3-2) UNRELEASED; urgency=medium
   * Backport "ar" arguments change from go1.6 to quiet spurious warnings while
     using gccgo (Closes: #807138)
   * Add "-k" to "run.bash" invocation so that we do a full test run every time
+  * Backport test skipping change from go1.6 for multicast listen in short mode
+    (Closes: #814849)
 
  -- Tianon Gravi <tianon at debian.org>  Tue, 02 Feb 2016 21:54:29 -0800
 
diff --git a/debian/patches/cl-17154.patch b/debian/patches/cl-17154.patch
new file mode 100644
index 0000000..06cb69c
--- /dev/null
+++ b/debian/patches/cl-17154.patch
@@ -0,0 +1,39 @@
+From 7e312243292866e73d2f2346a81eceffa1890f64 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant at golang.org>
+Date: Fri, 20 Nov 2015 16:01:45 -0800
+Subject: [PATCH] net: don't run multicast listen test on nil interface in
+ short mode
+
+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.
+
+Change-Id: I7eab8df34fe3b78fc376912312fac9d0f94977f1
+Reviewed-on: https://go-review.googlesource.com/17154
+Reviewed-by: Mikio Hara <mikioh.mikioh at gmail.com>
+---
+ src/net/listen_test.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/net/listen_test.go b/src/net/listen_test.go
+index d5627f2..51ffe67 100644
+--- a/src/net/listen_test.go
++++ b/src/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 {
diff --git a/debian/patches/series b/debian/patches/series
index 71532d4..7a06aad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 skip-userns-tests-when-chrooted.patch
 ar-rc.patch
+cl-17154.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git