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

diff --git a/src/pkg/os/exec/exec_test.go b/src/pkg/os/exec/exec_test.go
index dfcf4be231456c42a5267b8e07854e1bc7dfd601..2467d29a11eac9437a3d528af24e259b988432f9 100644 (file)
--- a/src/pkg/os/exec/exec_test.go
+++ b/src/pkg/os/exec/exec_test.go
@@ -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
 }
 

diff --git a/src/pkg/syscall/passfd_test.go b/src/pkg/syscall/passfd_test.go
index a0e590950755fc8f3b7866ddf42b394c87c8629f..e16debae199566a1999a1a53f3893cf133fc751b 100644 (file)
--- a/src/pkg/syscall/passfd_test.go
+++ b/src/pkg/syscall/passfd_test.go
@@ -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()