mirror of
https://github.com/golang/go
synced 2024-11-22 00:54:43 -07:00
test/run: fix builders
Let the outer environment filter down to the commands being run. TBR=r CC=golang-dev https://golang.org/cl/5758066
This commit is contained in:
parent
987a580b9f
commit
712473612f
@ -265,6 +265,10 @@ func (t *test) run() {
|
||||
err = ioutil.WriteFile(filepath.Join(t.tempDir, t.gofile), srcBytes, 0644)
|
||||
check(err)
|
||||
|
||||
// A few tests (of things like the environment) require these to be set.
|
||||
os.Setenv("GOOS", runtime.GOOS)
|
||||
os.Setenv("GOARCH", runtime.GOARCH)
|
||||
|
||||
useTmp := true
|
||||
runcmd := func(args ...string) ([]byte, error) {
|
||||
cmd := exec.Command(args[0], args[1:]...)
|
||||
@ -274,7 +278,6 @@ func (t *test) run() {
|
||||
if useTmp {
|
||||
cmd.Dir = t.tempDir
|
||||
}
|
||||
cmd.Env = append(cmd.Env, "GOOS="+runtime.GOOS, "GOARCH="+runtime.GOARCH)
|
||||
err := cmd.Run()
|
||||
return buf.Bytes(), err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user