]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: initialize netpoll in TestNetpollBreak
authorClément Chigot <chigot.c@gmail.com>
Tue, 29 Oct 2019 14:35:42 +0000 (15:35 +0100)
committerIan Lance Taylor <iant@golang.org>
Tue, 29 Oct 2019 17:38:23 +0000 (17:38 +0000)
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>
src/runtime/export_test.go
src/runtime/proc_test.go

index f5b44a29a0040e33163160bd9c1452e0ebf8c29a..0bd5c902e8f4999b1488c3823fc450d62bb5488a 100644 (file)
@@ -40,6 +40,8 @@ var Usleep = usleep
 
 var PhysHugePageSize = physHugePageSize
 
+var NetpollGenericInit = netpollGenericInit
+
 type LFNode struct {
        Next    uint64
        Pushcnt uintptr
index 3a1bf91fa5d9ac069e20ee69a29b74f4ad3d2a4e..9b80ce31e5d69bd98218e404249be942c584d6fc 100644 (file)
@@ -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)