From 910fee4ed55f1e9fa1386377c40f0b1eac63ee3f Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 11 May 2020 11:01:16 -0700 Subject: syscall: append to environment in tests, don't clobber it Fixes https://gcc.gnu.org/PR95061 Change-Id: I3cddfe5920b6da572ddeafa201617003c25175e6 Reviewed-on: https://go-review.googlesource.com/c/go/+/233318 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/syscall/exec_linux_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/syscall/exec_linux_test.go') diff --git a/src/syscall/exec_linux_test.go b/src/syscall/exec_linux_test.go index b7a8df21b5..b79dee7525 100644 --- a/src/syscall/exec_linux_test.go +++ b/src/syscall/exec_linux_test.go @@ -355,7 +355,7 @@ func TestUnshareMountNameSpace(t *testing.T) { } cmd := exec.Command(os.Args[0], "-test.run=TestUnshareMountNameSpaceHelper", d) - cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"} + cmd.Env = append(os.Environ(), "GO_WANT_HELPER_PROCESS=1") cmd.SysProcAttr = &syscall.SysProcAttr{Unshareflags: syscall.CLONE_NEWNS} o, err := cmd.CombinedOutput() @@ -406,7 +406,7 @@ func TestUnshareMountNameSpaceChroot(t *testing.T) { } cmd = exec.Command("/syscall.test", "-test.run=TestUnshareMountNameSpaceHelper", "/") - cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"} + cmd.Env = append(os.Environ(), "GO_WANT_HELPER_PROCESS=1") cmd.SysProcAttr = &syscall.SysProcAttr{Chroot: d, Unshareflags: syscall.CLONE_NEWNS} o, err := cmd.CombinedOutput() @@ -621,7 +621,7 @@ func testAmbientCaps(t *testing.T, userns bool) { } cmd := exec.Command(f.Name(), "-test.run=TestAmbientCapsHelper") - cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"} + cmd.Env = append(os.Environ(), "GO_WANT_HELPER_PROCESS=1") cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.SysProcAttr = &syscall.SysProcAttr{ -- cgit v1.3