https-github-com-bit
diff --git a/‎src/cmd/go/go_test.go‎
Lines changed: 3 additions & 0 deletions b/‎src/cmd/go/go_test.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/cmd/go/internal/list/list.go‎
Lines changed: 7 additions & 1 deletion b/‎src/cmd/go/internal/list/list.go‎
Lines changed: 7 additions & 1 deletion
@@ -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.
 
@@ -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.
Original file line number	Diff line number	Diff line change
`@@ -1946,6 +1946,9 @@ func TestGoListTest(t *testing.T) {`
`1946`	`1946`	tg.grepStdout(`^cmd/doc\.test$`, "missing cmd/doc test")
`1947`	`1947`	tg.grepStdoutNot(`^cmd/dist\.test$`, "unexpected cmd/dist test")
`1948`	`1948`	tg.grepStdoutNot(`^testing`, "unexpected testing")
	`1949`	`+`
	`1950`	`+ tg.run("list", "-test", "runtime/cgo")`
	`1951`	+ tg.grepStdout(`^runtime/cgo$`, "missing runtime/cgo")
`1949`	`1952`	`}`
`1950`	`1953`
`1951`	`1954`	`// Issue 4096. Validate the output of unsuccessful go install foo/quxx.`
Original file line number	Diff line number	Diff line change
`@@ -318,8 +318,14 @@ func runList(cmd *base.Command, args []string) {`
`318`	`318`	`}`
`319`	`319`	`// Update import path lists to use new strings.`
`320`	`320`	`for _, p := range all {`
	`321`	`+ j := 0`
`321`	`322`	`for i := range p.Imports {`
`322`		`- p.Imports[i] = p.Internal.Imports[i].ImportPath`
	`323`	`+ // Internal skips "C"`
	`324`	`+ if p.Imports[i] == "C" {`
	`325`	`+ continue`
	`326`	`+ }`
	`327`	`+ p.Imports[i] = p.Internal.Imports[j].ImportPath`
	`328`	`+ j++`
`323`	`329`	`}`
`324`	`330`	`}`
`325`	`331`	`// Recompute deps lists using new strings, from the leaves up.`