From: Dmitri Shuralyov Date: Tue, 20 Aug 2024 14:07:05 +0000 (-0400) Subject: testing: use temp dir without symlinks in TestChdir/relative X-Git-Tag: go1.24rc1~1156 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b292799ddd0e81ef6ffbbe5c7972786673d122f9;p=gostls13.git testing: use temp dir without symlinks in TestChdir/relative When paths with symlinks are involved, it's not viable to compare them with string equality. Don't use a temporary directory with symlinks in it as input, so the test works in more environments. For #62516. Change-Id: I95d774365cc2f90eb0ffcffa61229ed5cee43e3e Reviewed-on: https://go-review.googlesource.com/c/go/+/607035 Reviewed-by: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI Auto-Submit: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov --- diff --git a/src/testing/testing_test.go b/src/testing/testing_test.go index ff674fc3d1..1dd2039399 100644 --- a/src/testing/testing_test.go +++ b/src/testing/testing_test.go @@ -293,7 +293,11 @@ func TestChdir(t *testing.T) { } defer os.Chdir(oldDir) - tmp := t.TempDir() + // The "relative" test case relies on tmp not being a symlink. + tmp, err := filepath.EvalSymlinks(t.TempDir()) + if err != nil { + t.Fatal(err) + } rel, err := filepath.Rel(oldDir, tmp) if err != nil { t.Fatal(err)