cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 15:43:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test,internal/testdir: don't set GOOS/GOARCH

Browse Source 
The test directory driver currently sets the GOOS/GOARCH environment
variables if they aren't set. This appears to be in service of a
single test, test/env.go, which was introduced in September 2008 along
with os.Getenv. It's not entirely clear what that test is even trying
to check, since runtime.GOOS isn't necessarily the same as $GOOS. We
keep the test around because golang.org/x/tools/go/ssa/interp uses it
as a test case, but we simplify the test and eliminate the need for
the driver to set GOOS/GOARCH.

Change-Id: I5acc0093b557c95d1f0a526d031210256a68222d
Reviewed-on: https://go-review.googlesource.com/c/go/+/493601
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
This commit is contained in:
Austin Clements 2023-05-08 10:47:45 -04:00
parent 6693807668
commit b6c75c5fb1
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal/testdir/testdir_test.go
View File

@ -571,14 +571,6 @@ func (t test) run() error {
t.Fatal(err) t.Fatal(err)
} }
// A few tests (of things like the environment) require these to be set.
if os.Getenv("GOOS") == "" {
os.Setenv("GOOS", runtime.GOOS)
}
if os.Getenv("GOARCH") == "" {
os.Setenv("GOARCH", runtime.GOARCH)
}
var ( var (
runInDir = tempDir runInDir = tempDir
tempDirIsGOPATH = false tempDirIsGOPATH = false

13
test/env.go
View File

@ -4,8 +4,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// Test that the Go environment variables are present and accessible through // Test that environment variables are accessible through
// package os and package runtime. // package os.
package main package main
@ -15,9 +15,12 @@ import (
) )
func main() { func main() {
ga := os.Getenv("GOARCH") ga := os.Getenv("PATH")
if ga != runtime.GOARCH { if runtime.GOOS == "plan9" {
print("$GOARCH=", ga, "!= runtime.GOARCH=", runtime.GOARCH, "\n") ga = os.Getenv("path")
}
if ga == "" {
print("PATH is empty\n")
os.Exit(1) os.Exit(1)
} }
xxx := os.Getenv("DOES_NOT_EXIST") xxx := os.Getenv("DOES_NOT_EXIST")