From 58631ba54f45506f2f178bb01d22273e7dfba674 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 9 Mar 2022 17:19:23 -0500 Subject: internal/testenv: add GOROOT and use it to fix tests broken with -trimpath This fixes many (but not all) of the tests that currently fail (due to a bogus path reported by runtime.GOROOT) when run with 'go test -trimpath std cmd'. Updates #51461 Change-Id: Ia2cc05705529c4859e7928f32eeceed647f2e986 Reviewed-on: https://go-review.googlesource.com/c/go/+/391806 Trust: Bryan Mills Run-TryBot: Bryan Mills Reviewed-by: Russ Cox TryBot-Result: Gopher Robot --- src/path/filepath/path_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/path') diff --git a/src/path/filepath/path_test.go b/src/path/filepath/path_test.go index 55b27f1af8..cfd0c8244d 100644 --- a/src/path/filepath/path_test.go +++ b/src/path/filepath/path_test.go @@ -1329,7 +1329,7 @@ func TestBug3486(t *testing.T) { // https://golang.org/issue/3486 if runtime.GOOS == "ios" { t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) } - root, err := filepath.EvalSymlinks(runtime.GOROOT() + "/test") + root, err := filepath.EvalSymlinks(testenv.GOROOT(t) + "/test") if err != nil { t.Fatal(err) } -- cgit v1.3-5-g9baa