Commit 4ef91fc8 authored by Dmitriy Vyukov's avatar Dmitriy Vyukov

cmd/go: fix selection of packages for testing

Currently it works incorrectly if user specifies own build tags
and with race detection (e.g. runtime/race is not selected,
because it contains only test files with +build race).

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6814107
parent 5e57954f
...@@ -430,7 +430,7 @@ func matchPackages(pattern string) []string { ...@@ -430,7 +430,7 @@ func matchPackages(pattern string) []string {
return filepath.SkipDir return filepath.SkipDir
} }
_, err = build.ImportDir(path, 0) _, err = buildContext.ImportDir(path, 0)
if err != nil { if err != nil {
return nil return nil
} }
...@@ -471,7 +471,7 @@ func matchPackages(pattern string) []string { ...@@ -471,7 +471,7 @@ func matchPackages(pattern string) []string {
} }
have[name] = true have[name] = true
_, err = build.ImportDir(path, 0) _, err = buildContext.ImportDir(path, 0)
if err != nil && strings.Contains(err.Error(), "no Go source files") { if err != nil && strings.Contains(err.Error(), "no Go source files") {
return nil return nil
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment