qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 08:28:34 -06:00
Code Releases Activity

cmd/go: fix go list -test where C is a dependency.

Browse Source 
Currently go list -test runtime/cgo fails with an index out of range
error. This appears to be because the updating of import paths that
happens as part of -test doesn't take into account the fact that the
Internal.Imports of a package do not contain "C", whereas the public
Imports do.

Therefore we skip the public Import of "C" if it exists and continue.

Change-Id: I5cdc8968890fa7e5da3e375718606037d3282754
Reviewed-on: https://go-review.googlesource.com/111175
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Paul Jolly 2018-05-03 08:42:45 +01:00 committed by Ian Lance Taylor
parent cf4e5597b7
commit 941b3b7764
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmd/go/go_test.go
View File

@ -1946,6 +1946,9 @@ func TestGoListTest(t *testing.T) {
tg.grepStdout(`^cmd/doc\.test$`, "missing cmd/doc test")
tg.grepStdoutNot(`^cmd/dist\.test$`, "unexpected cmd/dist test")
tg.grepStdoutNot(`^testing`, "unexpected testing")
tg.run("list", "-test", "runtime/cgo")
tg.grepStdout(`^runtime/cgo$`, "missing runtime/cgo")
}
// Issue 4096. Validate the output of unsuccessful go install foo/quxx.

8
src/cmd/go/internal/list/list.go
View File

@ -318,8 +318,14 @@ func runList(cmd *base.Command, args []string) {
}
// Update import path lists to use new strings.
for _, p := range all {
j := 0
for i := range p.Imports {
p.Imports[i] = p.Internal.Imports[i].ImportPath
// Internal skips "C"
if p.Imports[i] == "C" {
continue
}
p.Imports[i] = p.Internal.Imports[j].ImportPath
j++
}
}
// Recompute deps lists using new strings, from the leaves up.