From d9c87a21a6c9f6b6440f6666c6a95da970753601 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 27 Nov 2017 22:38:48 +0000
Subject: [PATCH] run metalinter in make test and run_test.sh

---
 Makefile         | 9 +++++----
 circle.yml       | 1 -
 test/run_test.sh | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e1cf4842..f18dcb39 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,8 @@ dist:
 	@BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/dist.sh'"
 
 test:
+	@echo "--> Running linter"
+	@make metalinter_test
 	@echo "--> Running go test"
 	@go test $(PACKAGES)
 
@@ -77,15 +79,14 @@ tools:
 
 ensure_tools:
 	go get $(GOTOOLS)
+	@gometalinter --install
 
 ### Formatting, linting, and vetting
 
-metalinter: ensure_tools
-	@gometalinter --install
+metalinter: 
 	@gometalinter --vendor --deadline=600s --enable-all --disable=lll ./...
 
-metalinter_test: ensure_tools
-	@gometalinter --install
+metalinter_test: 
 	@gometalinter --vendor --deadline=600s --disable-all  \
 		--enable=deadcode \
 		--enable=gas \
diff --git a/circle.yml b/circle.yml
index d45cb016..50ffbd01 100644
--- a/circle.yml
+++ b/circle.yml
@@ -24,7 +24,6 @@ dependencies:
 
 test:
   override:
-    - cd "$PROJECT_PATH" && make get_vendor_deps && make metalinter_test
     - cd "$PROJECT_PATH" && set -o pipefail && make test_integrations 2>&1 | tee test_integrations.log:
         timeout: 1800
   post:
diff --git a/test/run_test.sh b/test/run_test.sh
index 6e4823f1..cecd2c72 100644
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -6,6 +6,10 @@ pwd
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
 echo "Current branch: $BRANCH"
 
+# run the linter
+# TODO: drop the `_test` once we're ballin' enough
+make metalinter_test
+
 # run the go unit tests with coverage
 bash test/test_cover.sh