mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/go: use tags when evaluating file system wildcards like ./... 

Thanks to Albert Hafvenström for the diagnosis.

Fixes #11246.

Change-Id: I2b9e670c0ecf6aa01e5bf4d7a402619e93cc4f4a
Reviewed-on: https://go-review.googlesource.com/17942
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Russ Cox 2015-12-16 22:52:00 -05:00
parent 37f2afa625
commit 70cee781fc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,6 +781,16 @@ func TestGoInstallDetectsRemovedFiles(t *testing.T) {
tg.wantStale("mypkg", "./testgo list mypkg claims mypkg is NOT stale after removing y.go; should be stale") tg.wantStale("mypkg", "./testgo list mypkg claims mypkg is NOT stale after removing y.go; should be stale")
} }
func TestGoListWithTags(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()
tg.tempFile("src/mypkg/x.go", "// +build thetag\n\npackage mypkg\n")
tg.setenv("GOPATH", tg.path("."))
tg.cd(tg.path("./src"))
tg.run("list", "-tags=thetag", "./my...")
tg.grepStdout("mypkg", "did not find mypkg")
}
func TestGoInstallErrorOnCrossCompileToBin(t *testing.T) { func TestGoInstallErrorOnCrossCompileToBin(t *testing.T) {
if testing.Short() { if testing.Short() {
t.Skip("don't install into GOROOT in short mode") t.Skip("don't install into GOROOT in short mode")

2
src/cmd/go/main.go
View File

@ -674,7 +674,7 @@ func matchPackagesInFS(pattern string) []string {
if !match(name) { if !match(name) {
return nil return nil
} }
if _, err = build.ImportDir(path, 0); err != nil { if _, err = buildContext.ImportDir(path, 0); err != nil {
if _, noGo := err.(*build.NoGoError); !noGo { if _, noGo := err.(*build.NoGoError); !noGo {
log.Print(err) log.Print(err)
} }