tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: always run go vet

Browse Source 
This ensures 'make test' finds all errors that remote CI would find.
Go 1.7 vet reports a false positive in package log, add a workaround.
This commit is contained in:
Felix Lange 2017-03-23 15:48:30 +01:00
parent e7911ad9ea
commit df1fbe3c06
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -24,7 +24,7 @@ matrix:
- sudo chmod 666 /dev/fuse - sudo chmod 666 /dev/fuse
- sudo chown root:$USER /etc/fuse.conf - sudo chown root:$USER /etc/fuse.conf
- go run build/ci.go install - go run build/ci.go install
- go run build/ci.go test -coverage -vet -misspell - go run build/ci.go test -coverage -misspell
- os: osx - os: osx
go: 1.8 go: 1.8
@ -34,7 +34,7 @@ matrix:
- brew install caskroom/cask/brew-cask - brew install caskroom/cask/brew-cask
- brew cask install osxfuse - brew cask install osxfuse
- go run build/ci.go install - go run build/ci.go install
- go run build/ci.go test -coverage -vet -misspell - go run build/ci.go test -coverage -misspell
# This builder does the Ubuntu PPA and Linux Azure uploads # This builder does the Ubuntu PPA and Linux Azure uploads
- os: linux - os: linux

2
appveyor.yml
View File

@ -36,4 +36,4 @@ after_build:
test_script: test_script:
- set CGO_ENABLED=1 - set CGO_ENABLED=1
- go run build\ci.go test -vet -coverage - go run build\ci.go test -coverage

5
build/ci.go
View File

@ -24,7 +24,7 @@ Usage: go run ci.go <command> <command flags/arguments>
Available commands are: Available commands are:
install [ -arch architecture ] [ packages... ] -- builds packages and executables install [ -arch architecture ] [ packages... ] -- builds packages and executables
test [ -coverage ] [ -vet ] [ -misspell ] [ packages... ] -- runs the tests test [ -coverage ] [ -misspell ] [ packages... ] -- runs the tests
archive [ -arch architecture ] [ -type zip|tar ] [ -signer key-envvar ] [ -upload dest ] -- archives build artefacts archive [ -arch architecture ] [ -type zip|tar ] [ -signer key-envvar ] [ -upload dest ] -- archives build artefacts
importkeys -- imports signing keys from env importkeys -- imports signing keys from env
debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package
@ -262,7 +262,6 @@ func goToolArch(arch string, subcmd string, args ...string) *exec.Cmd {
func doTest(cmdline []string) { func doTest(cmdline []string) {
var ( var (
vet = flag.Bool("vet", false, "Whether to run go vet")
misspell = flag.Bool("misspell", false, "Whether to run the spell checker") misspell = flag.Bool("misspell", false, "Whether to run the spell checker")
coverage = flag.Bool("coverage", false, "Whether to record code coverage") coverage = flag.Bool("coverage", false, "Whether to record code coverage")
) )
@ -275,9 +274,7 @@ func doTest(cmdline []string) {
packages = build.ExpandPackagesNoVendor(packages) packages = build.ExpandPackagesNoVendor(packages)
// Run analysis tools before the tests. // Run analysis tools before the tests.
if *vet {
build.MustRun(goTool("vet", packages...)) build.MustRun(goTool("vet", packages...))
}
if *misspell { if *misspell {
spellcheck(packages) spellcheck(packages)
} }

7
log/handler.go
View File

@ -106,11 +106,16 @@ func CallerFileHandler(h Handler) Handler {
// the context with key "fn". // the context with key "fn".
func CallerFuncHandler(h Handler) Handler { func CallerFuncHandler(h Handler) Handler {
return FuncHandler(func(r *Record) error { return FuncHandler(func(r *Record) error {
r.Ctx = append(r.Ctx, "fn", fmt.Sprintf("%+n", r.Call)) r.Ctx = append(r.Ctx, "fn", formatCall("%+n", r.Call))
return h.Log(r) return h.Log(r)
}) })
} }
// This function is here to please go vet on Go < 1.8.
func formatCall(format string, c stack.Call) string {
return fmt.Sprintf(format, c)
}
// CallerStackHandler returns a Handler that adds a stack trace to the context // CallerStackHandler returns a Handler that adds a stack trace to the context
// with key "stack". The stack trace is formated as a space separated list of // with key "stack". The stack trace is formated as a space separated list of
// call sites inside matching []'s. The most recent call site is listed first. // call sites inside matching []'s. The most recent call site is listed first.