Skip to content

tests: fix check to enable the race detector in supported platforms #40764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mauri870 merged 5 commits into from
Sep 16, 2024
Merged

tests: fix check to enable the race detector in supported platforms #40764

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f75436a
tests: fix check to enable the race detector in supported platforms
mauri870 Sep 11, 2024
8050139
add log if race is enabled for an unsupported platform
mauri870 Sep 12, 2024
a30d864
Merge branch 'main' into test-race-supported-platforms
mauri870 Sep 13, 2024
4098a61
Merge branch 'main' into test-race-supported-platforms
mauri870 Sep 13, 2024
52d8579
Merge branch 'main' into test-race-supported-platforms
mauri870 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions dev-tools/mage/gotest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"os/exec"
"path"
"path/filepath"
"slices"
"strings"
"time"

Expand Down Expand Up @@ -273,10 +274,20 @@ func GoTest(ctx context.Context, params GoTestArgs) error {

var testArgs []string

// -race is only supported on */amd64
if os.Getenv("DEV_ARCH") == "amd64" {
if params.Race {
if params.Race {
// Enable the race detector for supported platforms.
// This is an intersection of the supported platforms for Beats and Go.
//
// See https://go.dev/doc/articles/race_detector#Requirements.
devOS := os.Getenv("DEV_OS")
devArch := os.Getenv("DEV_ARCH")
raceAmd64 := devArch == "amd64"
raceArm64 := devArch == "arm64" &&
slices.Contains([]string{"linux", "darwin"}, devOS)
if raceAmd64 || raceArm64 {
testArgs = append(testArgs, "-race")
} else {
log.Printf("Warning: skipping -race flag for unsupported platform %s/%s\n", devOS, devArch)
}
}
if len(params.Tags) > 0 {
Expand Down