From 7fbce931012a32b2bd3a4e9fb98e4943faa7ebaf Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Sun, 10 Mar 2019 21:27:10 -0700
Subject: [PATCH] Replace test script with Makefile test targets

---
 .travis.yml      | 13 +++++--------
 Makefile         | 19 +++++++++++++++++--
 scripts/dev/test | 23 -----------------------
 3 files changed, 22 insertions(+), 33 deletions(-)
 delete mode 100755 scripts/dev/test

diff --git a/.travis.yml b/.travis.yml
index 878d71d5..be3ad3d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,17 +3,14 @@ sudo: required
 services:
   - docker
 go:
-  - 1.10.x
-  - 1.11.x
-  - 1.11.5
-  - tip
-matrix:
-  allow_failures:
-    - go: tip
+  - "1.10.x"
+  - "1.11.x"
+  - "1.11.5"
+  - "1.12.x"
 install:
   - go get golang.org/x/lint/golint
 script:
-  - make test
+  - make
 deploy:
   provider: script
   script: scripts/dev/travis-docker-push
diff --git a/Makefile b/Makefile
index 67f672aa..6d2d660c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,15 +7,30 @@ REPO=github.com/coreos/matchbox
 IMAGE_REPO=coreos/matchbox
 QUAY_REPO=quay.io/coreos/matchbox
 
-all: build
+.PHONY: all
+all: build test vet lint fmt
 
+.PHONY: build
 build: clean bin/matchbox
 
 bin/%:
 	@go build -o bin/$* -v -ldflags $(LD_FLAGS) $(REPO)/cmd/$*
 
+.PHONY: test
 test:
-	@./scripts/dev/test
+	@go test ./... -cover
+
+.PHONY: vet
+vet:
+	@go vet -all ./...
+
+.PHONY: lint
+lint:
+	@golint -set_exit_status `go list ./... | grep -v pb`
+
+.PHONY: fmt
+fmt:
+	@test -z $$(go fmt ./...)
 
 .PHONY: aci
 aci: clean build
diff --git a/scripts/dev/test b/scripts/dev/test
deleted file mode 100755
index 48a5413e..00000000
--- a/scripts/dev/test
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-PKGS=$(go list ./... | grep -v /vendor)
-FORMATTABLE=$(ls -d */ | grep -v -E '(vendor/|examples/)')
-LINTABLE=$(go list ./... | grep -v -E '(vendor/|pb$)')
-
-go test $PKGS -cover
-go vet $PKGS
-
-echo "Checking gofmt..."
-fmtRes=$(gofmt -l $FORMATTABLE)
-if [ -n "${fmtRes}" ]; then
-  echo -e "gofmt checking failed:\n${fmtRes}"
-  exit 2
-fi
-
-echo "Checking golint..."
-lintRes=$(echo $LINTABLE | xargs -n 1 golint)
-if [ -n "${lintRes}" ]; then
-  echo -e "golint checking failed:\n${lintRes}"
-  exit 2
-fi