Commit fbfa806e by Ian Lance Taylor

syscall: append to environment in tests, don't clobber it

This is a partial backport of https://golang.org/cl/233318.
It's only a partial backport because part of the change was
already applied to libgo in CL 193497 as part of the update
to the Go 1.13beta1 release.

Fixes PR go/95061

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/233359
parent 15a38f49
...@@ -187,7 +187,7 @@ func TestLinuxDeathSignal(t *testing.T) { ...@@ -187,7 +187,7 @@ func TestLinuxDeathSignal(t *testing.T) {
} }
cmd := exec.Command(tmpBinary) cmd := exec.Command(tmpBinary)
cmd.Env = []string{"GO_DEATHSIG_PARENT=1"} cmd.Env = append(os.Environ(), "GO_DEATHSIG_PARENT=1")
chldStdin, err := cmd.StdinPipe() chldStdin, err := cmd.StdinPipe()
if err != nil { if err != nil {
t.Fatalf("failed to create new stdin pipe: %v", err) t.Fatalf("failed to create new stdin pipe: %v", err)
...@@ -225,7 +225,10 @@ func TestLinuxDeathSignal(t *testing.T) { ...@@ -225,7 +225,10 @@ func TestLinuxDeathSignal(t *testing.T) {
func deathSignalParent() { func deathSignalParent() {
cmd := exec.Command(os.Args[0]) cmd := exec.Command(os.Args[0])
cmd.Env = []string{"GO_DEATHSIG_CHILD=1"} cmd.Env = append(os.Environ(),
"GO_DEATHSIG_PARENT=",
"GO_DEATHSIG_CHILD=1",
)
cmd.Stdin = os.Stdin cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
attrs := syscall.SysProcAttr{ attrs := syscall.SysProcAttr{
...@@ -360,7 +363,7 @@ func TestSyscallNoError(t *testing.T) { ...@@ -360,7 +363,7 @@ func TestSyscallNoError(t *testing.T) {
} }
cmd := exec.Command(tmpBinary) cmd := exec.Command(tmpBinary)
cmd.Env = []string{"GO_SYSCALL_NOERROR=1"} cmd.Env = append(os.Environ(), "GO_SYSCALL_NOERROR=1")
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment