From: Clément Chigot <chigot.c@gmail.com>
Date: Tue, 29 Oct 2019 14:35:42 +0000 (+0100)
Subject: runtime: initialize netpoll in TestNetpollBreak
X-Git-Tag: go1.14beta1~513
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=64533374941d238c542167d67711a66ebac4ef67;p=gostls13.git

runtime: initialize netpoll in TestNetpollBreak

Netpoll must be always be initialized when TestNetpollBreak is launched.
However, when it is run in standalone, it won't be the case, so it must
be forced.

Updates: #27707

Change-Id: I28147f3834f3d6aca982c6a298feadc09b55f66e
Reviewed-on: https://go-review.googlesource.com/c/go/+/204058
Run-TryBot: Clément Chigot <clement.chigot%atos.net@gtempaccount.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/runtime/export_test.go b/src/runtime/export_test.go
index f5b44a29a0..0bd5c902e8 100644
--- a/src/runtime/export_test.go
+++ b/src/runtime/export_test.go
@@ -40,6 +40,8 @@ var Usleep = usleep
 
 var PhysHugePageSize = physHugePageSize
 
+var NetpollGenericInit = netpollGenericInit
+
 type LFNode struct {
 	Next    uint64
 	Pushcnt uintptr
diff --git a/src/runtime/proc_test.go b/src/runtime/proc_test.go
index 3a1bf91fa5..9b80ce31e5 100644
--- a/src/runtime/proc_test.go
+++ b/src/runtime/proc_test.go
@@ -992,7 +992,7 @@ func TestNetpollBreak(t *testing.T) {
 	}
 
 	// Make sure that netpoll is initialized.
-	time.Sleep(1)
+	runtime.NetpollGenericInit()
 
 	start := time.Now()
 	c := make(chan bool, 2)