mirror of
https://github.com/golang/go
synced 2024-11-12 04:50:21 -07:00
cmd/go: go test -i correctly handle cgo packages
Previous CL (5674043) omit the case where runtime/cgo itself is out-of-date. Fixes #2936 (again). R=rsc CC=golang-dev https://golang.org/cl/5674048
This commit is contained in:
parent
2506fd43d4
commit
9c1f54c9ed
@ -15,6 +15,7 @@ import (
|
||||
"os/exec"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"sort"
|
||||
"strings"
|
||||
"text/template"
|
||||
@ -273,8 +274,15 @@ func runTest(cmd *Command, args []string) {
|
||||
}
|
||||
}
|
||||
|
||||
// translate C to runtime/cgo
|
||||
if deps["C"] {
|
||||
delete(deps, "C")
|
||||
deps["runtime/cgo"] = true
|
||||
if buildContext.GOOS == runtime.GOOS && buildContext.GOARCH == runtime.GOARCH {
|
||||
deps["cmd/cgo"] = true
|
||||
}
|
||||
}
|
||||
// Ignore pseudo-packages.
|
||||
delete(deps, "C")
|
||||
delete(deps, "unsafe")
|
||||
|
||||
all := []string{}
|
||||
|
Loading…
Reference in New Issue
Block a user