From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Wed, 13 Jun 2012 20:24:38 +0000 (-0400)
Subject: [release-branch.go1] path/filepath: fix test
X-Git-Tag: go1.0.2~32
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0a6b1d66f668cf7daa73befbb5fec62fa521cf38;p=gostls13.git

[release-branch.go1] path/filepath: fix test

««« backport 912fdfb20cc6
path/filepath: fix test

Make it possible to run test over symlinked GOROOT.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6268046

»»»
---

diff --git a/src/pkg/path/filepath/path_test.go b/src/pkg/path/filepath/path_test.go
index 59e79350b7..070905fd3e 100644
--- a/src/pkg/path/filepath/path_test.go
+++ b/src/pkg/path/filepath/path_test.go
@@ -871,7 +871,10 @@ func TestDriveLetterInEvalSymlinks(t *testing.T) {
 }
 
 func TestBug3486(t *testing.T) { // http://code.google.com/p/go/issues/detail?id=3486
-	root := os.Getenv("GOROOT")
+	root, err := filepath.EvalSymlinks(os.Getenv("GOROOT"))
+	if err != nil {
+		t.Fatal(err)
+	}
 	lib := filepath.Join(root, "lib")
 	src := filepath.Join(root, "src")
 	seenSrc := false