From 2ceeb7b090464a8da421f72e19267869b86b0901 Mon Sep 17 00:00:00 2001 From: Remi Gillig Date: Sat, 11 Feb 2017 17:34:48 +0000 Subject: [PATCH] path/filepath: fix TestWinSplitListTestsAreValid on some systems The environment variables used in those tests override the default OS ones. However, one of them (SystemRoot) seems to be required on some Windows systems for invoking cmd.exe properly. This fixes #4930 and #6568. Change-Id: I23dfb67c1de86020711a3b59513f6adcbba12561 Reviewed-on: https://go-review.googlesource.com/36873 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/path/filepath/path_windows_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/path/filepath/path_windows_test.go b/src/path/filepath/path_windows_test.go index 73e74be8d3..c9a0255efd 100644 --- a/src/path/filepath/path_windows_test.go +++ b/src/path/filepath/path_windows_test.go @@ -67,6 +67,9 @@ func testWinSplitListTestIsValid(t *testing.T, ti int, tt SplitListTest, } } + // on some systems, SystemRoot is required for cmd to work + systemRoot := os.Getenv("SystemRoot") + for i, d := range tt.result { if d == "" { continue @@ -75,7 +78,7 @@ func testWinSplitListTestIsValid(t *testing.T, ti int, tt SplitListTest, cmd := &exec.Cmd{ Path: comspec, Args: []string{`/c`, cmdfile}, - Env: []string{`Path=` + tt.list}, + Env: []string{`Path=` + tt.list, `SystemRoot=` + systemRoot}, Dir: tmp, } out, err := cmd.CombinedOutput() -- 2.48.1