Fix windows build issue

This commit is contained in:
tidwall 2018-11-05 10:58:01 -07:00
parent 07bae979a5
commit e46c945f2c
3 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
.DS_Store .DS_Store
tile38-* tile38-*
!cmd/tile38-* !cmd/tile38-*
*.test
data*/ data*/
coverage.out coverage.out
packages/ packages/

View File

@ -180,7 +180,7 @@ if [ "$1" == "test" ]; then
} }
trap testend EXIT trap testend EXIT
cd tests && go test && cd .. cd tests && go test && cd ..
go test $(go list ./... | grep -v /vendor/ | grep -v /tests | grep -v /pkg/geojson_bak) go test $(go list ./... | grep -v /vendor/ | grep -v /tests)
fi fi
# cover if requested # cover if requested

View File

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
) )
func (c *Controller) writeInfoCPU(w *bytes.Buffer) { func (s *Server) writeInfoCPU(w *bytes.Buffer) {
fmt.Fprintf(w, fmt.Fprintf(w,
"used_cpu_sys:%.2f\r\n"+ "used_cpu_sys:%.2f\r\n"+
"used_cpu_user:%.2f\r\n"+ "used_cpu_user:%.2f\r\n"+