1
0
mirror of https://github.com/golang/go synced 2024-11-26 15:56:57 -07:00

os/exec, syscall: fix tests to pass when GOGCTRACE=1 is set

R=golang-dev, bradfitz, minux.ma
CC=golang-dev
https://golang.org/cl/8193043
This commit is contained in:
Albert Strasheim 2013-03-30 09:22:11 -07:00 committed by Brad Fitzpatrick
parent ad95b7d23c
commit 0399e76b66
2 changed files with 2 additions and 2 deletions

View File

@ -25,7 +25,7 @@ func helperCommand(s ...string) *Cmd {
cs := []string{"-test.run=TestHelperProcess", "--"}
cs = append(cs, s...)
cmd := Command(os.Args[0], cs...)
cmd.Env = append([]string{"GO_WANT_HELPER_PROCESS=1"}, os.Environ()...)
cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
return cmd
}

View File

@ -49,7 +49,7 @@ func TestPassFD(t *testing.T) {
defer readFile.Close()
cmd := exec.Command(os.Args[0], "-test.run=^TestPassFD$", "--", tempDir)
cmd.Env = append([]string{"GO_WANT_HELPER_PROCESS=1"}, os.Environ()...)
cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
cmd.ExtraFiles = []*os.File{writeFile}
out, err := cmd.CombinedOutput()