qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 04:44:41 -07:00
Code Releases Activity

cmd/go: revise importPath when ImportPath is 'command-line-arguments'

Browse Source 
Fixes #14613

Change-Id: I40d9696db3879549e78373ef17f6c92bd4b3470b
Reviewed-on: https://go-review.googlesource.com/21596
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:
Cheng-Lung Sung 2016-04-06 23:05:20 +08:00 committed by Brad Fitzpatrick
parent e88f89028a
commit dfded57819
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/go/pkg.go
View File

@ -434,6 +434,12 @@ func vendoredImportPath(parent *Package, path string) (found string) {
} }
targ := filepath.Join(dir[:i], vpath) targ := filepath.Join(dir[:i], vpath)
if isDir(targ) && hasGoFiles(targ) { if isDir(targ) && hasGoFiles(targ) {
importPath := parent.ImportPath
if importPath == "command-line-arguments" {
// If parent.ImportPath is 'command-line-arguments'.
// set to relative directory to root (also chopped root directory)
importPath = dir[len(root)+1:]
}
// We started with parent's dir c:\gopath\src\foo\bar\baz\quux\xyzzy. // We started with parent's dir c:\gopath\src\foo\bar\baz\quux\xyzzy.
// We know the import path for parent's dir. // We know the import path for parent's dir.
// We chopped off some number of path elements and // We chopped off some number of path elements and
@ -443,14 +449,14 @@ func vendoredImportPath(parent *Package, path string) (found string) {
// (actually the same number of bytes) from parent's import path // (actually the same number of bytes) from parent's import path
// and then append /vendor/path. // and then append /vendor/path.
chopped := len(dir) - i chopped := len(dir) - i
if chopped == len(parent.ImportPath)+1 { if chopped == len(importPath)+1 {
// We walked up from c:\gopath\src\foo\bar // We walked up from c:\gopath\src\foo\bar
// and found c:\gopath\src\vendor\path. // and found c:\gopath\src\vendor\path.
// We chopped \foo\bar (length 8) but the import path is "foo/bar" (length 7). // We chopped \foo\bar (length 8) but the import path is "foo/bar" (length 7).
// Use "vendor/path" without any prefix. // Use "vendor/path" without any prefix.
return vpath return vpath
} }
return parent.ImportPath[:len(parent.ImportPath)-chopped] + "/" + vpath return importPath[:len(importPath)-chopped] + "/" + vpath
} }
} }
return path return path

26
src/cmd/go/vendor_test.go
View File

@ -232,6 +232,32 @@ func TestVendorTest2(t *testing.T) {
tg.run("test", "github.com/rsc/go-get-issue-11864/vendor/vendor.org/tx2") tg.run("test", "github.com/rsc/go-get-issue-11864/vendor/vendor.org/tx2")
} }
func TestVendorTest3(t *testing.T) {
testenv.MustHaveExternalNetwork(t)
tg := testgo(t)
defer tg.cleanup()
tg.makeTempdir()
tg.setenv("GOPATH", tg.path("."))
tg.run("get", "github.com/clsung/go-vendor-issue-14613")
tg.run("build", "-i", "github.com/clsung/go-vendor-issue-14613")
// test folder should work
tg.run("test", "-i", "github.com/clsung/go-vendor-issue-14613")
tg.run("test", "github.com/clsung/go-vendor-issue-14613")
// test with specified _test.go should work too
tg.cd(filepath.Join(tg.path("."), "src"))
tg.run("test", "-i", "github.com/clsung/go-vendor-issue-14613/vendor_test.go")
tg.run("test", "github.com/clsung/go-vendor-issue-14613/vendor_test.go")
// test with imported and not used
tg.run("test", "-i", "github.com/clsung/go-vendor-issue-14613/vendor/mylibtesttest/myapp/myapp_test.go")
tg.runFail("test", "github.com/clsung/go-vendor-issue-14613/vendor/mylibtesttest/myapp/myapp_test.go")
tg.grepStderr("imported and not used:", `should say "imported and not used"`)
}
func TestVendorList(t *testing.T) { func TestVendorList(t *testing.T) {
testenv.MustHaveExternalNetwork(t) testenv.MustHaveExternalNetwork(t)