From afec1bd1245a4a19e6dfe1306974b733e7cbb9b8 Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Mon, 21 Nov 2016 09:17:32 -0600
Subject: [PATCH] build: Give linters longer and cleanup goclean.sh.

This modifies the goclean.sh script to expand the deadline for the
linters to run to 4 minutes and ensures the comments match reality.
---
 goclean.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/goclean.sh b/goclean.sh
index fe88a47c..8eba37f2 100755
--- a/goclean.sh
+++ b/goclean.sh
@@ -3,11 +3,13 @@
 # 1. gofmt         (http://golang.org/cmd/gofmt/)
 # 2. golint        (https://github.com/golang/lint)
 # 3. go vet        (http://golang.org/cmd/vet)
-# 4. race detector (http://blog.golang.org/race-detector)
-# 5. test coverage (http://blog.golang.org/cover)
+# 4. gosimple      (https://github.com/dominikh/go-simple)
+# 5. unconvert     (https://github.com/mdempsky/unconvert)
+# 6. race detector (http://blog.golang.org/race-detector)
+# 7. test coverage (http://blog.golang.org/cover)
 #
-# gometaling (github.com/alecthomas/gometalinter) is used to run each each
-# static checker.
+# gometalinter (github.com/alecthomas/gometalinter) is used to run each static
+# checker.
 
 set -ex
 
@@ -18,7 +20,7 @@ test -z "$(gometalinter --disable-all \
 --enable=vet \
 --enable=gosimple \
 --enable=unconvert \
---deadline=20s $(glide novendor) | grep -v 'ALL_CAPS\|OP_' 2>&1 | tee /dev/stderr)"
+--deadline=4m $(glide novendor) | grep -v 'ALL_CAPS\|OP_' 2>&1 | tee /dev/stderr)"
 env GORACE="halt_on_error=1" go test -v -race -tags rpctest $(glide novendor)
 
 # Run test coverage on each subdirectories and merge the coverage profile.