1
0
mirror of https://github.com/golang/go synced 2024-11-23 07:50:05 -07:00

cmd/vet: don't run buildtag check when in vetxonly mode

The check was running in the loop that read source files in, much before
any of the other checks ran. Vetxonly makes vet exit early, but after
all the source files have been read.

To fix this, simply run the buildtag check along with all the other
checks that get run on specific syntax tree nodes.

Add a cmd/go test with go test -a, to ensure that the issue as reported
is fixed.

Fixes #26102.

Change-Id: If6e3b9418ffa8166c0f982668b0d10872283776a
Reviewed-on: https://go-review.googlesource.com/121395
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Daniel Martí 2018-06-28 17:18:01 +01:00
parent 997d7a1893
commit 1d1e25fba8
3 changed files with 8 additions and 1 deletions

View File

@ -5817,6 +5817,11 @@ func TestTestVet(t *testing.T) {
tg.runFail("test", "vetfail/...") tg.runFail("test", "vetfail/...")
tg.grepStderr(`Printf format %d`, "did not diagnose bad Printf") tg.grepStderr(`Printf format %d`, "did not diagnose bad Printf")
tg.grepStdout(`ok\s+vetfail/p2`, "did not run vetfail/p2") tg.grepStdout(`ok\s+vetfail/p2`, "did not run vetfail/p2")
// Use -a so that we need to recompute the vet-specific export data for
// vetfail/p1.
tg.run("test", "-a", "vetfail/p2")
tg.grepStderrNot(`invalid.*constraint`, "did diagnose bad build constraint in vetxonly mode")
} }
func TestTestVetRebuild(t *testing.T) { func TestTestVetRebuild(t *testing.T) {

View File

@ -1,3 +1,5 @@
// +build !foo-bar
package p1 package p1
import "fmt" import "fmt"

View File

@ -489,7 +489,6 @@ func doPackage(names []string, basePkg *Package) *Package {
file: parsedFile, file: parsedFile,
dead: make(map[ast.Node]bool), dead: make(map[ast.Node]bool),
} }
checkBuildTag(file)
files = append(files, file) files = append(files, file)
} }
if len(astFiles) == 0 { if len(astFiles) == 0 {
@ -541,6 +540,7 @@ func doPackage(names []string, basePkg *Package) *Package {
} }
} }
for _, file := range files { for _, file := range files {
checkBuildTag(file)
file.checkers = chk file.checkers = chk
if file.file != nil { if file.file != nil {
file.walkFile(file.name, file.file) file.walkFile(file.name, file.file)