From 64533374941d238c542167d67711a66ebac4ef67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Chigot?= Date: Tue, 29 Oct 2019 15:35:42 +0100 Subject: [PATCH] runtime: initialize netpoll in TestNetpollBreak MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/runtime/export_test.go | 2 ++ src/runtime/proc_test.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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) -- 2.50.0