@@ -12,7 +12,6 @@ package testenv
1212
1313import (
1414 "bytes"
15- "errors"
1615 "flag"
1716 "fmt"
1817 "os"
@@ -43,15 +42,22 @@ func Builder() string {
4342
4443// HasGoBuild reports whether the current system can build programs with “go build”
4544// and then run them with os.StartProcess or exec.Command.
46- // Modified by Hugo (not needed)
4745func HasGoBuild () bool {
48- return false
46+ if os .Getenv ("GO_GCFLAGS" ) != "" {
47+ // It's too much work to require every caller of the go command
48+ // to pass along "-gcflags="+os.Getenv("GO_GCFLAGS").
49+ // For now, if $GO_GCFLAGS is set, report that we simply can't
50+ // run go build.
51+ return false
52+ }
53+
54+ return tryGoBuild () == nil
4955}
5056
51- var (
52- goBuildOnce sync. Once
53- goBuildErr error
54- )
57+ var tryGoBuild = sync . OnceValue ( func () error {
58+ // Removed by Hugo, not used.
59+ return nil
60+ } )
5561
5662// MustHaveGoBuild checks that the current system can build programs with “go build”
5763// and then run them with os.StartProcess or exec.Command.
@@ -63,7 +69,7 @@ func MustHaveGoBuild(t testing.TB) {
6369 }
6470 if ! HasGoBuild () {
6571 t .Helper ()
66- t .Skipf ("skipping test: 'go build' unavailable: %v" , goBuildErr )
72+ t .Skipf ("skipping test: 'go build' unavailable: %v" , tryGoBuild () )
6773 }
6874}
6975
@@ -77,6 +83,7 @@ func HasGoRun() bool {
7783// If not, MustHaveGoRun calls t.Skip with an explanation.
7884func MustHaveGoRun (t testing.TB ) {
7985 if ! HasGoRun () {
86+ t .Helper ()
8087 t .Skipf ("skipping test: 'go run' not available on %s/%s" , runtime .GOOS , runtime .GOARCH )
8188 }
8289}
@@ -96,6 +103,7 @@ func HasParallelism() bool {
96103// threads in parallel. If not, MustHaveParallelism calls t.Skip with an explanation.
97104func MustHaveParallelism (t testing.TB ) {
98105 if ! HasParallelism () {
106+ t .Helper ()
99107 t .Skipf ("skipping test: no parallelism available on %s/%s" , runtime .GOOS , runtime .GOARCH )
100108 }
101109}
@@ -119,82 +127,67 @@ func GoToolPath(t testing.TB) string {
119127 return path
120128}
121129
122- var (
123- gorootOnce sync.Once
124- gorootPath string
125- gorootErr error
126- )
127-
128- func findGOROOT () (string , error ) {
129- gorootOnce .Do (func () {
130- gorootPath = runtime .GOROOT ()
131- if gorootPath != "" {
132- // If runtime.GOROOT() is non-empty, assume that it is valid.
133- //
134- // (It might not be: for example, the user may have explicitly set GOROOT
135- // to the wrong directory. But this case is
136- // rare, and if that happens the user can fix what they broke.)
137- return
138- }
139-
140- // runtime.GOROOT doesn't know where GOROOT is (perhaps because the test
141- // binary was built with -trimpath).
130+ var findGOROOT = sync .OnceValues (func () (path string , err error ) {
131+ if path := runtime .GOROOT (); path != "" {
132+ // If runtime.GOROOT() is non-empty, assume that it is valid.
142133 //
143- // Since this is internal/testenv, we can cheat and assume that the caller
144- // is a test of some package in a subdirectory of GOROOT/src. ('go test'
145- // runs the test in the directory containing the packaged under test.) That
146- // means that if we start walking up the tree, we should eventually find
147- // GOROOT/src/go.mod, and we can report the parent directory of that.
148- //
149- // Notably, this works even if we can't run 'go env GOROOT' as a
150- // subprocess.
134+ // (It might not be: for example, the user may have explicitly set GOROOT
135+ // to the wrong directory. But this case is
136+ // rare, and if that happens the user can fix what they broke.)
137+ return path , nil
138+ }
151139
152- cwd , err := os .Getwd ()
153- if err != nil {
154- gorootErr = fmt .Errorf ("finding GOROOT: %w" , err )
155- return
140+ // runtime.GOROOT doesn't know where GOROOT is (perhaps because the test
141+ // binary was built with -trimpath).
142+ //
143+ // Since this is internal/testenv, we can cheat and assume that the caller
144+ // is a test of some package in a subdirectory of GOROOT/src. ('go test'
145+ // runs the test in the directory containing the packaged under test.) That
146+ // means that if we start walking up the tree, we should eventually find
147+ // GOROOT/src/go.mod, and we can report the parent directory of that.
148+ //
149+ // Notably, this works even if we can't run 'go env GOROOT' as a
150+ // subprocess.
151+
152+ cwd , err := os .Getwd ()
153+ if err != nil {
154+ return "" , fmt .Errorf ("finding GOROOT: %w" , err )
155+ }
156+
157+ dir := cwd
158+ for {
159+ parent := filepath .Dir (dir )
160+ if parent == dir {
161+ // dir is either "." or only a volume name.
162+ return "" , fmt .Errorf ("failed to locate GOROOT/src in any parent directory" )
156163 }
157164
158- dir := cwd
159- for {
160- parent := filepath .Dir (dir )
161- if parent == dir {
162- // dir is either "." or only a volume name.
163- gorootErr = fmt .Errorf ("failed to locate GOROOT/src in any parent directory" )
164- return
165- }
165+ if base := filepath .Base (dir ); base != "src" {
166+ dir = parent
167+ continue // dir cannot be GOROOT/src if it doesn't end in "src".
168+ }
166169
167- if base := filepath .Base (dir ); base != "src" {
170+ b , err := os .ReadFile (filepath .Join (dir , "go.mod" ))
171+ if err != nil {
172+ if os .IsNotExist (err ) {
168173 dir = parent
169- continue // dir cannot be GOROOT/src if it doesn't end in "src".
170- }
171-
172- b , err := os .ReadFile (filepath .Join (dir , "go.mod" ))
173- if err != nil {
174- if os .IsNotExist (err ) {
175- dir = parent
176- continue
177- }
178- gorootErr = fmt .Errorf ("finding GOROOT: %w" , err )
179- return
174+ continue
180175 }
181- goMod := string ( b )
182-
183- for goMod != "" {
184- var line string
185- line , goMod , _ = strings . Cut ( goMod , " \n " )
186- fields := strings . Fields ( line )
187- if len ( fields ) >= 2 && fields [ 0 ] == "module" && fields [ 1 ] == "std" {
188- // Found "module std", which is the module declaration in GOROOT/src!
189- gorootPath = parent
190- return
191- }
176+ return "" , fmt . Errorf ( "finding GOROOT: %w" , err )
177+ }
178+ goMod := string ( b )
179+
180+ for goMod != "" {
181+ var line string
182+ line , goMod , _ = strings . Cut ( goMod , " \n " )
183+ fields := strings . Fields ( line )
184+ if len ( fields ) >= 2 && fields [ 0 ] == "module" && fields [ 1 ] == "std" {
185+ // Found "module std", which is the module declaration in GOROOT/src!
186+ return parent , nil
192187 }
193188 }
194- })
195-
196- return gorootPath , gorootErr
197- }
189+ }
190+ })
198191
199192// GOROOT reports the path to the directory containing the root of the Go
200193// project source tree. This is normally equivalent to runtime.GOROOT, but
@@ -217,28 +210,22 @@ func GOROOT(t testing.TB) string {
217210
218211// GoTool reports the path to the Go tool.
219212func GoTool () (string , error ) {
220- if ! HasGoBuild () {
221- return "" , errors .New ("platform cannot run go tool" )
222- }
223- goToolOnce .Do (func () {
224- goToolPath , goToolErr = exec .LookPath ("go" )
225- })
226- return goToolPath , goToolErr
213+ // Removed by Hugo, not used.
214+ return "" , nil
227215}
228216
229- var (
230- goToolOnce sync.Once
231- goToolPath string
232- goToolErr error
233- )
217+ var goTool = sync .OnceValues (func () (string , error ) {
218+ return exec .LookPath ("go" )
219+ })
234220
235- // HasSrc reports whether the entire source tree is available under GOROOT.
236- func HasSrc () bool {
221+ // MustHaveSource checks that the entire source tree is available under GOROOT.
222+ // If not, it calls t.Skip with an explanation.
223+ func MustHaveSource (t testing.TB ) {
237224 switch runtime .GOOS {
238225 case "ios" :
239- return false
226+ t .Helper ()
227+ t .Skip ("skipping test: no source tree on " + runtime .GOOS )
240228 }
241- return true
242229}
243230
244231// HasExternalNetwork reports whether the current system can use
@@ -263,41 +250,39 @@ func MustHaveExternalNetwork(t testing.TB) {
263250
264251// HasCGO reports whether the current system can use cgo.
265252func HasCGO () bool {
266- hasCgoOnce .Do (func () {
267- goTool , err := GoTool ()
268- if err != nil {
269- return
270- }
271- cmd := exec .Command (goTool , "env" , "CGO_ENABLED" )
272- cmd .Env = origEnv
273- out , err := cmd .Output ()
274- if err != nil {
275- panic (fmt .Sprintf ("%v: %v" , cmd , out ))
276- }
277- hasCgo , err = strconv .ParseBool (string (bytes .TrimSpace (out )))
278- if err != nil {
279- panic (fmt .Sprintf ("%v: non-boolean output %q" , cmd , out ))
280- }
281- })
282- return hasCgo
253+ return hasCgo ()
283254}
284255
285- var (
286- hasCgoOnce sync.Once
287- hasCgo bool
288- )
256+ var hasCgo = sync .OnceValue (func () bool {
257+ goTool , err := goTool ()
258+ if err != nil {
259+ return false
260+ }
261+ cmd := exec .Command (goTool , "env" , "CGO_ENABLED" )
262+ cmd .Env = origEnv
263+ out , err := cmd .Output ()
264+ if err != nil {
265+ panic (fmt .Sprintf ("%v: %v" , cmd , out ))
266+ }
267+ ok , err := strconv .ParseBool (string (bytes .TrimSpace (out )))
268+ if err != nil {
269+ panic (fmt .Sprintf ("%v: non-boolean output %q" , cmd , out ))
270+ }
271+ return ok
272+ })
289273
290274// MustHaveCGO calls t.Skip if cgo is not available.
291275func MustHaveCGO (t testing.TB ) {
292276 if ! HasCGO () {
277+ t .Helper ()
293278 t .Skipf ("skipping test: no cgo" )
294279 }
295280}
296281
297282// CanInternalLink reports whether the current system can link programs with
298283// internal linking.
299- // Modified by Hugo (not needed)
300284func CanInternalLink (withCgo bool ) bool {
285+ // Removed by Hugo, not used.
301286 return false
302287}
303288
@@ -306,6 +291,7 @@ func CanInternalLink(withCgo bool) bool {
306291// If not, MustInternalLink calls t.Skip with an explanation.
307292func MustInternalLink (t testing.TB , withCgo bool ) {
308293 if ! CanInternalLink (withCgo ) {
294+ t .Helper ()
309295 if withCgo && CanInternalLink (false ) {
310296 t .Skipf ("skipping test: internal linking on %s/%s is not supported with cgo" , runtime .GOOS , runtime .GOARCH )
311297 }
@@ -316,15 +302,15 @@ func MustInternalLink(t testing.TB, withCgo bool) {
316302// MustInternalLinkPIE checks whether the current system can link PIE binary using
317303// internal linking.
318304// If not, MustInternalLinkPIE calls t.Skip with an explanation.
319- // Modified by Hugo (not needed)
320305func MustInternalLinkPIE (t testing.TB ) {
306+ // Removed by Hugo, not used.
321307}
322308
323309// MustHaveBuildMode reports whether the current system can build programs in
324310// the given build mode.
325311// If not, MustHaveBuildMode calls t.Skip with an explanation.
326- // Modified by Hugo (not needed)
327312func MustHaveBuildMode (t testing.TB , buildmode string ) {
313+ // Removed by Hugo, not used.
328314}
329315
330316// HasSymlink reports whether the current system can use os.Symlink.
@@ -338,6 +324,7 @@ func HasSymlink() bool {
338324func MustHaveSymlink (t testing.TB ) {
339325 ok , reason := hasSymlink ()
340326 if ! ok {
327+ t .Helper ()
341328 t .Skipf ("skipping test: cannot make symlinks on %s/%s: %s" , runtime .GOOS , runtime .GOARCH , reason )
342329 }
343330}
@@ -354,22 +341,23 @@ func HasLink() bool {
354341// If not, MustHaveLink calls t.Skip with an explanation.
355342func MustHaveLink (t testing.TB ) {
356343 if ! HasLink () {
344+ t .Helper ()
357345 t .Skipf ("skipping test: hardlinks are not supported on %s/%s" , runtime .GOOS , runtime .GOARCH )
358346 }
359347}
360348
361349var flaky = flag .Bool ("flaky" , false , "run known-flaky tests too" )
362350
363351func SkipFlaky (t testing.TB , issue int ) {
364- t .Helper ()
365352 if ! * flaky {
353+ t .Helper ()
366354 t .Skipf ("skipping known flaky test without the -flaky flag; see golang.org/issue/%d" , issue )
367355 }
368356}
369357
370358func SkipFlakyNet (t testing.TB ) {
371- t .Helper ()
372359 if v , _ := strconv .ParseBool (os .Getenv ("GO_BUILDER_FLAKY_NET" )); v {
360+ t .Helper ()
373361 t .Skip ("skipping test on builder known to have frequent network failures" )
374362 }
375363}
@@ -455,6 +443,6 @@ func SyscallIsNotSupported(err error) bool {
455443// ParallelOn64Bit calls t.Parallel() unless there is a case that cannot be parallel.
456444// This function should be used when it is necessary to avoid t.Parallel on
457445// 32-bit machines, typically because the test uses lots of memory.
458- // Disabled by Hugo.
459446func ParallelOn64Bit (t * testing.T ) {
447+ // Removed by Hugo, not used.
460448}
0 commit comments