golang/go1.5beta1-fix-TestVendorRu...

30 lines
870 B
Diff

commit 9adf684686bad7c6319080d0b1da8308a77b08c9
Author: Russ Cox <rsc@golang.org>
Date: Tue Jul 14 15:15:37 2015 -0400
cmd/go: fix TestVendorRun when $GOROOT is inside a symlinked path
Fixes #11305.
Change-Id: Icaa3a009aa4ab214c9aaf74f52c3e622fa266a9d
Reviewed-on: https://go-review.googlesource.com/12194
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index 98486c5..af54396 100644
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -188,7 +188,11 @@ func (tg *testgoData) cd(dir string) {
if tg.wd == "" {
tg.wd = tg.pwd()
}
+ abs, err := filepath.Abs(dir)
tg.must(os.Chdir(dir))
+ if err == nil {
+ tg.setenv("PWD", abs)
+ }
}
// sleep sleeps for one tick, where a tick is a conservative estimate