diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-05-11 16:23:44 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-05-11 17:27:46 -0700 |
| commit | 4f157ed7749fd13c3562dd09696f7d675b86434f (patch) | |
| tree | 8210b525b3773e6d9debf626e550d81beccdcef3 /libgo | |
| parent | b58c5e0c73424586b881cc5926c7b6fd9c7151f0 (diff) | |
| download | gcc-4f157ed7749fd13c3562dd09696f7d675b86434f.zip gcc-4f157ed7749fd13c3562dd09696f7d675b86434f.tar.gz gcc-4f157ed7749fd13c3562dd09696f7d675b86434f.tar.bz2 | |
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
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/syscall/syscall_linux_test.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libgo/go/syscall/syscall_linux_test.go b/libgo/go/syscall/syscall_linux_test.go index 97059c8..c12df4c 100644 --- a/libgo/go/syscall/syscall_linux_test.go +++ b/libgo/go/syscall/syscall_linux_test.go @@ -187,7 +187,7 @@ func TestLinuxDeathSignal(t *testing.T) { } cmd := exec.Command(tmpBinary) - cmd.Env = []string{"GO_DEATHSIG_PARENT=1"} + cmd.Env = append(os.Environ(), "GO_DEATHSIG_PARENT=1") chldStdin, err := cmd.StdinPipe() if err != nil { t.Fatalf("failed to create new stdin pipe: %v", err) @@ -225,7 +225,10 @@ func TestLinuxDeathSignal(t *testing.T) { func deathSignalParent() { 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.Stdout = os.Stdout attrs := syscall.SysProcAttr{ @@ -360,7 +363,7 @@ func TestSyscallNoError(t *testing.T) { } cmd := exec.Command(tmpBinary) - cmd.Env = []string{"GO_SYSCALL_NOERROR=1"} + cmd.Env = append(os.Environ(), "GO_SYSCALL_NOERROR=1") out, err := cmd.CombinedOutput() if err != nil { |