languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-15 22:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

runtime: add cgo guard for exit hooks test

Browse source 
Add an additional guard to ensure that we don't try to run the "-race"
variant of the exit hooks test when CGO is explicitly turned off via
CGO_ENABLED=0 (this fixes a failure on the no-cgo builder caused
by CL 354790).

Change-Id: I9dc7fbd71962e9a098916da69d9119a753f27116
Reviewed-on: https://go-review.googlesource.com/c/go/+/434935
Run-TryBot: Than McIntosh <thanm@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Than McIntosh 2022-09-26 20:52:09 -04:00
parent f6e1677428
commit 550864e5d2
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/runtime/ehooks_test.go
View file

@ -5,6 +5,7 @@
package runtime_test
import (
"internal/testenv"
"os/exec"
"runtime"
"strings"
@ -12,16 +13,16 @@ import (
)
func TestExitHooks(t *testing.T) {
bmodes := []string{"", "-race"}
if !testing.Short() {
bmodes := []string{""}
// Race detector is not supported everywhere -- limit to just
// linux/amd64 to keep things simple. Note the HasCGO() test
// below; this is to prevent the test running if CGO_ENABLED=0
// is in effect.
if !testing.Short() && runtime.GOARCH == "amd64" &&
runtime.GOOS == "linux" && testenv.HasCGO() {
bmodes = append(bmodes, "-race")
}
for _, bmode := range bmodes {
// Race detector is not supported everywhere -- limit to just
// amd64 to keep things simple.
if bmode == "-race" && runtime.GOARCH != "amd64" {
t.Skipf("Skipping on %s/%s", runtime.GOOS, runtime.GOARCH)
}
scenarios := []struct {
mode string
expected string

2
src/runtime/testdata/testexithooks/testexithooks.go vendored
View file

@ -10,8 +10,6 @@ import (
_ "unsafe"
)
import "C"
var modeflag = flag.String("mode", "", "mode to run in")
func main() {