internal/vcs: remove SYSTEMROOT workaround for Windows

mvdan · mvdan · commit 9fdff48f3bb5 · 2025-08-18T12:06:47.000+01:00
https://go.dev/issue/25513 was resolved in Go 1.13 such that %SYSTEMROOT% is always inherited by sub-processes by default.
diff --git a/testscript/testscript.go b/testscript/testscript.go
@@ -494,16 +494,10 @@ func (ts *TestScript) setup() string {
 			env.Vars = append(env.Vars, name+"="+val)
 		}
 	}
-	// Must preserve SYSTEMROOT on Windows: https://github.com/golang/go/issues/25513 et al
 	if runtime.GOOS == "windows" {
-		env.Vars = append(env.Vars,
-			"SYSTEMROOT="+os.Getenv("SYSTEMROOT"),
-			"exe=.exe",
-		)
+		env.Vars = append(env.Vars, "exe=.exe")
 	} else {
-		env.Vars = append(env.Vars,
-			"exe=",
-		)
+		env.Vars = append(env.Vars, "exe=")
 	}
 	ts.cd = env.Cd
 	// Unpack archive.

Original file line number	Diff line number	Diff line change
`@@ -494,16 +494,10 @@ func (ts *TestScript) setup() string {`
`494`	`494`	`env.Vars = append(env.Vars, name+"="+val)`
`495`	`495`	`}`
`496`	`496`	`}`
`497`		`- // Must preserve SYSTEMROOT on Windows: https://github.com/golang/go/issues/25513 et al`
`498`	`497`	`if runtime.GOOS == "windows" {`
`499`		`- env.Vars = append(env.Vars,`
`500`		`- "SYSTEMROOT="+os.Getenv("SYSTEMROOT"),`
`501`		`- "exe=.exe",`
`502`		`- )`
	`498`	`+ env.Vars = append(env.Vars, "exe=.exe")`
`503`	`499`	`} else {`
`504`		`- env.Vars = append(env.Vars,`
`505`		`- "exe=",`
`506`		`- )`
	`500`	`+ env.Vars = append(env.Vars, "exe=")`
`507`	`501`	`}`
`508`	`502`	`ts.cd = env.Cd`
`509`	`503`	`// Unpack archive.`