aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorPaul E. Murphy <murp@ibm.com>2021-11-19 16:33:42 -0600
committerPaul Murphy <murp@ibm.com>2021-11-30 20:04:58 +0000
commit7ccbcc90560468937f02609a43cb39a6e13ff797 (patch)
treede439ff684934f28f571ea98291708fce1f8b34e /misc
parent5f63f168daa9644bcc723077e9e2e1796639f6bb (diff)
downloadgo-7ccbcc90560468937f02609a43cb39a6e13ff797.tar.gz
go-7ccbcc90560468937f02609a43cb39a6e13ff797.zip
misc/cgo/test: further reduce likeliness of hang in Test9400
As suggested by #49680, a GC could be in-progress when we disable GC. Force a GC after we pause to ensure we don't hang in this case. For #49695 Change-Id: I4fc4c06ef2ac174217c3dcf7d58c7669226e2d24 Reviewed-on: https://go-review.googlesource.com/c/go/+/367874 Run-TryBot: Paul Murphy <murp@ibm.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org> Trust: Paul Murphy <murp@ibm.com>
Diffstat (limited to 'misc')
-rw-r--r--misc/cgo/test/testdata/issue9400_linux.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/misc/cgo/test/testdata/issue9400_linux.go b/misc/cgo/test/testdata/issue9400_linux.go
index f521b1f49a..47f224dc4f 100644
--- a/misc/cgo/test/testdata/issue9400_linux.go
+++ b/misc/cgo/test/testdata/issue9400_linux.go
@@ -50,6 +50,8 @@ func test9400(t *testing.T) {
// Disable GC for the duration of the test.
// This avoids a potential GC deadlock when spinning in uninterruptable ASM below #49695.
defer debug.SetGCPercent(debug.SetGCPercent(-1))
+ // And finish any pending GC after we pause, if any.
+ runtime.GC()
// Temporarily rewind the stack and trigger SIGSETXID
issue9400.RewindAndSetgid()