Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

all: replace os.Getenv("GO_BUILDER_NAME") with testenv.Builder in tests

Browse source 
Some tests still reach for GO_BUILDER_NAME directly. This change makes
it so that they go through testenv.Builder.

There are a couple more, but changing them may also cause tests to start
failing. Done in a follow-up.

Change-Id: Id2453b7b62f5ebf3594e92fa53724a577a97440f
Reviewed-on: https://go-review.googlesource.com/c/go/+/703135
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Michael Anthony Knyszek 2025-09-11 23:48:04 +00:00 • committed by Michael Knyszek
parent dbde15800c
commit 004858ccdd
6 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/cgo/internal/testcarchive/carchive_test.go
View file

@ -58,7 +58,7 @@ func TestMain(m *testing.M) {
} }
func testMain(m *testing.M) int { func testMain(m *testing.M) int {
if testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" { if testing.Short() && testenv.Builder() == "" {
globalSkip = func(t testing.TB) { t.Skip("short mode and $GO_BUILDER_NAME not set") } globalSkip = func(t testing.TB) { t.Skip("short mode and $GO_BUILDER_NAME not set") }
return m.Run() return m.Run()
} }

2
src/cmd/cgo/internal/testcshared/cshared_test.go
View file

@ -44,7 +44,7 @@ func TestMain(m *testing.M) {
func testMain(m *testing.M) int { func testMain(m *testing.M) int {
log.SetFlags(log.Lshortfile) log.SetFlags(log.Lshortfile)
flag.Parse() flag.Parse()
if testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" { if testing.Short() && testenv.Builder() == "" {
globalSkip = func(t *testing.T) { t.Skip("short mode and $GO_BUILDER_NAME not set") } globalSkip = func(t *testing.T) { t.Skip("short mode and $GO_BUILDER_NAME not set") }
return m.Run() return m.Run()
} }

2
src/cmd/cgo/internal/testplugin/plugin_test.go
View file

@ -46,7 +46,7 @@ func prettyPrintf(format string, args ...interface{}) {
} }
func testMain(m *testing.M) int { func testMain(m *testing.M) int {
if testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" { if testing.Short() && testenv.Builder() == "" {
globalSkip = func(t *testing.T) { t.Skip("short mode and $GO_BUILDER_NAME not set") } globalSkip = func(t *testing.T) { t.Skip("short mode and $GO_BUILDER_NAME not set") }
return m.Run() return m.Run()
} }

4
src/cmd/cgo/internal/testshared/shared_test.go
View file

@ -96,7 +96,7 @@ func goCmd(t *testing.T, args ...string) string {
// TestMain calls testMain so that the latter can use defer (TestMain exits with os.Exit). // TestMain calls testMain so that the latter can use defer (TestMain exits with os.Exit).
func testMain(m *testing.M) (int, error) { func testMain(m *testing.M) (int, error) {
if testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" { if testing.Short() && testenv.Builder() == "" {
globalSkip = func(t testing.TB) { t.Skip("short mode and $GO_BUILDER_NAME not set") } globalSkip = func(t testing.TB) { t.Skip("short mode and $GO_BUILDER_NAME not set") }
return m.Run(), nil return m.Run(), nil
} }
@ -554,7 +554,7 @@ func checkPIE(t *testing.T, name string) {
} }
func TestTrivialPIE(t *testing.T) { func TestTrivialPIE(t *testing.T) {
if strings.HasSuffix(os.Getenv("GO_BUILDER_NAME"), "-alpine") { if strings.Contains(testenv.Builder(), "-alpine") {
t.Skip("skipping on alpine until issue #54354 resolved") t.Skip("skipping on alpine until issue #54354 resolved")
} }
globalSkip(t) globalSkip(t)

2
src/cmd/link/link_test.go
View file

@ -280,7 +280,7 @@ func TestBuildForTvOS(t *testing.T) {
if runtime.GOOS != "darwin" { if runtime.GOOS != "darwin" {
t.Skip("skipping on non-darwin platform") t.Skip("skipping on non-darwin platform")
} }
if testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" { if testing.Short() && testenv.Builder() == "" {
t.Skip("skipping in -short mode with $GO_BUILDER_NAME empty") t.Skip("skipping in -short mode with $GO_BUILDER_NAME empty")
} }
if err := testenv.Command(t, "xcrun", "--help").Run(); err != nil { if err := testenv.Command(t, "xcrun", "--help").Run(); err != nil {

3
src/syscall/getdirentries_test.go
View file

@ -8,6 +8,7 @@ package syscall_test
import ( import (
"fmt" "fmt"
"internal/testenv"
"os" "os"
"path/filepath" "path/filepath"
"slices" "slices"
@ -24,7 +25,7 @@ func TestGetdirentries(t *testing.T) {
} }
} }
func testGetdirentries(t *testing.T, count int) { func testGetdirentries(t *testing.T, count int) {
if count > 100 && testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" { if count > 100 && testing.Short() && testenv.Builder() == "" {
t.Skip("skipping in -short mode") t.Skip("skipping in -short mode")
} }
d := t.TempDir() d := t.TempDir()