From: Andrew Gerrand <adg@golang.org>
Date: Mon, 21 Mar 2011 00:24:48 +0000 (+1100)
Subject: path/filepath: fix TestEvalSymlinks when run under symlinked GOROOT
X-Git-Tag: weekly.2011-03-28~84
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=338185dabb6a0c966e366c56ab89d749d27a33f9;p=gostls13.git

path/filepath: fix TestEvalSymlinks when run under symlinked GOROOT

Fixes #1622.

R=rsc, bradfitzgo
CC=golang-dev
https://golang.org/cl/4287063
---

diff --git a/src/pkg/path/filepath/path_test.go b/src/pkg/path/filepath/path_test.go
index 5c891dee62..2af6e51324 100644
--- a/src/pkg/path/filepath/path_test.go
+++ b/src/pkg/path/filepath/path_test.go
@@ -465,7 +465,11 @@ func TestEvalSymlinks(t *testing.T) {
 		}
 	}
 	// absolute
-	testroot := filepath.Join(os.Getenv("GOROOT"), "src", "pkg", "path", "filepath")
+	goroot, err := filepath.EvalSymlinks(os.Getenv("GOROOT"))
+	if err != nil {
+		t.Fatalf("EvalSymlinks(%q) error: %v", os.Getenv("GOROOT"), err)
+	}
+	testroot := filepath.Join(goroot, "src", "pkg", "path", "filepath")
 	for _, d := range EvalSymlinksTests {
 		a := EvalSymlinksTest{
 			filepath.Join(testroot, d.path),