close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imports: make filepath.Rel work on windows 

filepath.Rel will always fail if one parameter starts with
drive letter and the other does not. Make both filepath.Rel
parameters absolute paths, to give it chance to succeed.

Fixes broken tools build on windows.

Change-Id: Ibefcfe283f28977503323f01bc3a698478227f84
Reviewed-on: https://go-review.googlesource.com/25120
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Alex Brainman 2016-07-21 16:51:57 +10:00 committed by Brad Fitzpatrick
parent 55296b3beb
commit 682b241254
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imports/fix.go
View File

@ -827,11 +827,15 @@ func canUse(filename, dir string) bool {
// or bar/vendor or bar/internal. // or bar/vendor or bar/internal.
// After stripping all the leading ../, the only okay place to see vendor or internal // After stripping all the leading ../, the only okay place to see vendor or internal
// is at the very beginning of the path. // is at the very beginning of the path.
abs, err := filepath.Abs(filename) absfile, err := filepath.Abs(filename)
if err != nil { if err != nil {
return false return false
} }
rel, err := filepath.Rel(abs, dir) absdir, err := filepath.Abs(dir)
if err != nil {
return false
}
rel, err := filepath.Rel(absfile, absdir)
if err != nil { if err != nil {
return false return false
} }

2
imports/fix_test.go
View File

@ -829,7 +829,7 @@ func TestFixImports(t *testing.T) {
func TestImportSymlinks(t *testing.T) { func TestImportSymlinks(t *testing.T) {
switch runtime.GOOS { switch runtime.GOOS {
case "windows", "plan9": case "windows", "plan9":
t.Skip("skipping test on %q as there are no symlinks", runtime.GOOS) t.Skipf("skipping test on %q as there are no symlinks", runtime.GOOS)
} }
newGoPath, err := ioutil.TempDir("", "symlinktest") newGoPath, err := ioutil.TempDir("", "symlinktest")