From e46c945f2c4442b069b25e4d72e8bbf0aeb45d1d Mon Sep 17 00:00:00 2001 From: tidwall Date: Mon, 5 Nov 2018 10:58:01 -0700 Subject: [PATCH] Fix windows build issue --- .gitignore | 1 + build.sh | 2 +- internal/server/stats_cpu.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c7c2978c..a99c97ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store tile38-* !cmd/tile38-* +*.test data*/ coverage.out packages/ diff --git a/build.sh b/build.sh index a60c9fdf..66491a01 100755 --- a/build.sh +++ b/build.sh @@ -180,7 +180,7 @@ if [ "$1" == "test" ]; then } trap testend EXIT 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 # cover if requested diff --git a/internal/server/stats_cpu.go b/internal/server/stats_cpu.go index 83f8733e..e78b86f2 100644 --- a/internal/server/stats_cpu.go +++ b/internal/server/stats_cpu.go @@ -7,7 +7,7 @@ import ( "fmt" ) -func (c *Controller) writeInfoCPU(w *bytes.Buffer) { +func (s *Server) writeInfoCPU(w *bytes.Buffer) { fmt.Fprintf(w, "used_cpu_sys:%.2f\r\n"+ "used_cpu_user:%.2f\r\n"+