From dc4b24898a0cd257acff391ffc3359f2a6d79c50 Mon Sep 17 00:00:00 2001
From: Henry Allen-Tilford <htilford@gmail.com>
Date: Mon, 31 Oct 2016 11:31:27 -0700
Subject: [PATCH 1/2] Add make cover command

---
 .gitignore |  2 ++
 Makefile   | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 673b4d188..39ba91e45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /amplifier
 /amp-agent
 /amp-log-worker
+coverage.out
+coverage-all.out
\ No newline at end of file
diff --git a/Makefile b/Makefile
index b90415aa5..801431ba6 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,9 @@ GLIDE := $(DOCKER_RUN) -u $(UG) -v $${HOME}/.ssh:/root/.ssh -v $${HOME}/.glide:/
 GLIDE_INSTALL := $(GLIDE) install
 GLIDE_UPDATE := $(GLIDE) update
 
+# $(REPO)/api/rpc/build @go test -v $(REPO)/api/rpc/project
+PACKAGES = $(REPO)/api/rpc/service $(REPO)/data/storage/etcd $(REPO)/api/rpc/stack $(REPO)/data/influx $(REPO)/api/rpc/stats $(REPO)/api/rpc/topic $(REPO)/api/rpc/logs
+
 all: version check build
 
 arch:
@@ -71,6 +74,7 @@ clean:
 	@rm -rf $(GENERATED)
 	@rm -f $$(which $(CLI)) ./$(CLI)
 	@rm -f $$(which $(SERVER)) ./$(SERVER)
+	@rm coverage.out coverage-all.out
 
 install-deps:
 	@$(GLIDE_INSTALL)
@@ -139,12 +143,12 @@ run: build-image
 	@CID=$(shell docker run --net=host -d --name $(SERVER) $(IMAGE)) && echo $${CID}
 
 test:
-#	@go test -v $(REPO)/api/rpc/build
-#	@go test -v $(REPO)/api/rpc/project
-	@go test -v $(REPO)/api/rpc/service
-	@go test -v $(REPO)/data/storage/etcd
-	@go test -v $(REPO)/api/rpc/stack
-	@go test -v $(REPO)/data/influx
-	@go test -v $(REPO)/api/rpc/stats
-	@go test -v $(REPO)/api/rpc/topic
-	@go test -v $(REPO)/api/rpc/logs
+	$(foreach pkg,$(PACKAGES),\
+		go test -v $(pkg);)
+
+cover:
+	echo "mode: count" > coverage-all.out
+	$(foreach pkg,$(PACKAGES),\
+		go test -coverprofile=coverage.out -covermode=count $(pkg);\
+		tail -n +2 coverage.out >> coverage-all.out;)
+	go tool cover -html=coverage-all.out

From 50dfdb53eb2b5b5cb785317021c8295d13220903 Mon Sep 17 00:00:00 2001
From: Tony Pujals <tony@subfuzion.com>
Date: Thu, 3 Nov 2016 11:05:53 -0700
Subject: [PATCH 2/2] minor edit to Makefile

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 801431ba6..536ae554a 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,8 @@ GLIDE := $(DOCKER_RUN) -u $(UG) -v $${HOME}/.ssh:/root/.ssh -v $${HOME}/.glide:/
 GLIDE_INSTALL := $(GLIDE) install
 GLIDE_UPDATE := $(GLIDE) update
 
+TEST_PACKAGES = $(REPO)/api/rpc/service $(REPO)/data/storage/etcd $(REPO)/api/rpc/stack $(REPO)/data/influx $(REPO)/api/rpc/stats $(REPO)/api/rpc/topic $(REPO)/api/rpc/logs
 # $(REPO)/api/rpc/build @go test -v $(REPO)/api/rpc/project
-PACKAGES = $(REPO)/api/rpc/service $(REPO)/data/storage/etcd $(REPO)/api/rpc/stack $(REPO)/data/influx $(REPO)/api/rpc/stats $(REPO)/api/rpc/topic $(REPO)/api/rpc/logs
 
 all: version check build
 
@@ -143,12 +143,13 @@ run: build-image
 	@CID=$(shell docker run --net=host -d --name $(SERVER) $(IMAGE)) && echo $${CID}
 
 test:
-	$(foreach pkg,$(PACKAGES),\
+	$(foreach pkg,$(TEST_PACKAGES),\
 		go test -v $(pkg);)
 
 cover:
 	echo "mode: count" > coverage-all.out
-	$(foreach pkg,$(PACKAGES),\
+	$(foreach pkg,$(TEST_PACKAGES),\
 		go test -coverprofile=coverage.out -covermode=count $(pkg);\
 		tail -n +2 coverage.out >> coverage-all.out;)
 	go tool cover -html=coverage-all.out
+