diff options
| author | Ian Lance Taylor <iant@golang.org> | 2018-07-10 21:07:55 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2018-07-13 17:17:54 +0000 |
| commit | ebdba42d9e1de46ebf611baec98d53f01c534cac (patch) | |
| tree | 0bc5b203400776beb3ba11b37222849f2cebb8c9 /src/runtime | |
| parent | 5201b1ad225e7503e368386ae3ad4f94d7b04d8b (diff) | |
| download | go-ebdba42d9e1de46ebf611baec98d53f01c534cac.tar.xz | |
runtime: check tgkill error in Debug tests
Updates #25519
Change-Id: Ibcdf948fd38d8d02d467b62213566ec0d7ce0d6a
Reviewed-on: https://go-review.googlesource.com/123180
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/debug_test.go | 4 | ||||
| -rw-r--r-- | src/runtime/export_debug_test.go | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/runtime/debug_test.go b/src/runtime/debug_test.go index 4181d59c1f..a34f4c77f7 100644 --- a/src/runtime/debug_test.go +++ b/src/runtime/debug_test.go @@ -69,8 +69,8 @@ func debugCallWorker2(stop *uint32, x *int) { *x = 1 } -func debugCallTKill(tid int) { - syscall.Tgkill(syscall.Getpid(), tid, syscall.SIGTRAP) +func debugCallTKill(tid int) error { + return syscall.Tgkill(syscall.Getpid(), tid, syscall.SIGTRAP) } func TestDebugCall(t *testing.T) { diff --git a/src/runtime/export_debug_test.go b/src/runtime/export_debug_test.go index 78436f36cf..d34c1fd7dc 100644 --- a/src/runtime/export_debug_test.go +++ b/src/runtime/export_debug_test.go @@ -20,7 +20,7 @@ import ( // // On success, InjectDebugCall returns the panic value of fn or nil. // If fn did not panic, its results will be available in args. -func InjectDebugCall(gp *g, fn, args interface{}, tkill func(tid int)) (interface{}, error) { +func InjectDebugCall(gp *g, fn, args interface{}, tkill func(tid int) error) (interface{}, error) { if gp.lockedm == 0 { return nil, plainError("goroutine not locked to thread") } @@ -54,7 +54,9 @@ func InjectDebugCall(gp *g, fn, args interface{}, tkill func(tid int)) (interfac defer func() { testSigtrap = nil }() testSigtrap = h.inject - tkill(tid) + if err := tkill(tid); err != nil { + return nil, err + } // Wait for completion. notetsleepg(&h.done, -1) if len(h.err) != 0 { |