close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go/packages: small fixes 

For performance, bail out of runNamedQueries before running go env if
there's nothing to do.

Add t.Helper() calls to packagestest.TestAll.

Escape # in packagestest.Export. The testing package adds #NN suffixes
to subtests that have redundant names.

Log how long gopathwalk.Walk took for name= queries when debug is on.

Change-Id: I37cb0ed11cf58e1693e29dea04697e5885ecc62b
Reviewed-on: https://go-review.googlesource.com/c/147203
Run-TryBot: Heschi Kreinick <heschi@google.com>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Heschi Kreinick 2018-11-02 17:43:46 -04:00
parent f7a8a58e8d
commit 1a6034dbfc
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
go/packages/golist.go
View File

@ -35,9 +35,6 @@ type goTooOldError struct {
// the build system package structure. // the build system package structure.
// See driver for more details. // See driver for more details.
func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) { func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) {
if debug {
defer func(start time.Time, patterns []string) { log.Printf("%v for query %v", time.Since(start), patterns) }(time.Now(), patterns)
}
// Determine files requested in contains patterns // Determine files requested in contains patterns
var containFiles []string var containFiles []string
var packagesNamed []string var packagesNamed []string
@ -180,6 +177,10 @@ func runContainsQueries(cfg *Config, driver driver, addPkg func(*Package), queri
var modCacheRegexp = regexp.MustCompile(`(.*)@([^/\\]*)(.*)`) var modCacheRegexp = regexp.MustCompile(`(.*)@([^/\\]*)(.*)`)
func runNamedQueries(cfg *Config, driver driver, addPkg func(*Package), queries []string) ([]string, error) { func runNamedQueries(cfg *Config, driver driver, addPkg func(*Package), queries []string) ([]string, error) {
// calling `go env` isn't free; bail out if there's nothing to do.
if len(queries) == 0 {
return nil, nil
}
// Determine which directories are relevant to scan. // Determine which directories are relevant to scan.
roots, modRoot, err := roots(cfg) roots, modRoot, err := roots(cfg)
if err != nil { if err != nil {
@ -216,7 +217,12 @@ func runNamedQueries(cfg *Config, driver driver, addPkg func(*Package), queries
} }
} }
} }
gopathwalk.Walk(roots, add, gopathwalk.Options{ModulesEnabled: modRoot != ""})
startWalk := time.Now()
gopathwalk.Walk(roots, add, gopathwalk.Options{ModulesEnabled: modRoot != "", Debug: debug})
if debug {
log.Printf("%v for walk", time.Since(startWalk))
}
// Weird special case: the top-level package in a module will be in // Weird special case: the top-level package in a module will be in
// whatever directory the user checked the repository out into. It's // whatever directory the user checked the repository out into. It's

10
go/packages/packagestest/export.go
View File

@ -85,8 +85,12 @@ var All []Exporter
// the All global. // the All global.
// Each exporter will be run as a sub-test named after the exporter being used. // Each exporter will be run as a sub-test named after the exporter being used.
func TestAll(t *testing.T, f func(*testing.T, Exporter)) { func TestAll(t *testing.T, f func(*testing.T, Exporter)) {
t.Helper()
for _, e := range All { for _, e := range All {
t.Run(e.Name(), func(t *testing.T) { f(t, e) }) t.Run(e.Name(), func(t *testing.T) {
t.Helper()
f(t, e)
})
} }
} }
@ -101,7 +105,9 @@ func TestAll(t *testing.T, f func(*testing.T, Exporter)) {
// debugging tests. // debugging tests.
func Export(t *testing.T, exporter Exporter, modules []Module) *Exported { func Export(t *testing.T, exporter Exporter, modules []Module) *Exported {
t.Helper() t.Helper()
temp, err := ioutil.TempDir("", strings.Replace(t.Name(), "/", "_", -1)) dirname := strings.Replace(t.Name(), "/", "_", -1)
dirname = strings.Replace(dirname, "#", "_", -1) // duplicate subtests get a #NNN suffix.
temp, err := ioutil.TempDir("", dirname)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }