From 3e0ca057405cf69bbf6c6046cc852714b489dbc7 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 30 Nov 2018 15:20:45 -0800
Subject: [PATCH 1/5] Makefile: add travis-race and travis-cover targets

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index fe0c0429..73bd99e3 100644
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,10 @@ goveralls: $(GOVERALLS_BIN)
 	@$(call print, "Sending coverage report.")
 	$(GOVERALLS_BIN) -coverprofile=profile.cov -service=travis-ci
 
+travis-race: btcd unit-race
+
+travis-cover: btcd lint unit-cover goveralls
+
 # =============
 # FLAKE HUNTING
 # =============
@@ -202,6 +206,8 @@ clean:
 	unit-cover \
 	unit-race \
 	goveralls \
+	travis-race \
+	travis-cover \
 	flakehunter \
 	flake-unit \
 	fmt \

From 2c716095d5a361b5096716845fd0635aad392c6c Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 30 Nov 2018 15:20:46 -0800
Subject: [PATCH 2/5] travis: use make targets instead of chaining

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c0c240e..323b8b36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,13 +29,13 @@ script:
   - export GO111MODULE=on
 
   # Run unit tests with race condition detector.
-  - 'if [ "$RACE" = true ]; then make btcd && make unit-race ; fi'
+  - 'if [ "$RACE" = true ]; then make travis-race ; fi'
 
   # Run integration tests.
-  - 'if [ "$ITEST" = true ]; then make btcd && make build && make itest-only; fi'
+  - 'if [ "$ITEST" = true ]; then make itest; fi'
 
   # Run unit tests and generate coverage report.
-  - 'if [ "$COVER" = true ]; then make btcd && make lint && make unit-cover && make goveralls; fi'
+  - 'if [ "$COVER" = true ]; then make travis-cover; fi'
 
 after_script:
   - echo "Uploading to termbin.com..." && find *.log | xargs -I{} sh -c "cat {} | nc termbin.com 9999 | xargs -r0 printf '{} uploaded to %s'"

From 0ad3302e165f6bad2bdb340cbc11ef265f1528e5 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 30 Nov 2018 15:20:47 -0800
Subject: [PATCH 3/5] Makefile: remove unnecessary PROD_TAGS

---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 73bd99e3..2d8cf447 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ XARGS := xargs -L 1
 include make/testing_flags.mk
 
 DEV_TAGS := $(if ${tags},$(DEV_TAGS) ${tags},$(DEV_TAGS))
-PROD_TAGS := $(if ${tags},$(PROD_TAGS) ${tags},$(PROD_TAGS))
 
 COVER = for dir in $(GOLISTCOVER); do \
 		$(GOTEST) -tags="$(DEV_TAGS) $(LOG_TAGS)" \
@@ -110,8 +109,8 @@ build:
 
 install:
 	@$(call print, "Installing lnd and lncli.")
-	$(GOINSTALL) -tags="$(PROD_TAGS)" $(LDFLAGS) $(PKG)
-	$(GOINSTALL) -tags="$(PROD_TAGS)" $(LDFLAGS) $(PKG)/cmd/lncli
+	$(GOINSTALL) -tags="${tags}" $(LDFLAGS) $(PKG)
+	$(GOINSTALL) -tags="${tags}" $(LDFLAGS) $(PKG)/cmd/lncli
 
 scratch: build
 

From 5039c106f66b0301ea3ef70b613af90e9bd20f02 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 30 Nov 2018 15:20:49 -0800
Subject: [PATCH 4/5] make/testing_flags: remove unused PROD_TAGS

---
 make/testing_flags.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/make/testing_flags.mk b/make/testing_flags.mk
index 1eedc3df..8c696441 100644
--- a/make/testing_flags.mk
+++ b/make/testing_flags.mk
@@ -1,5 +1,4 @@
 DEV_TAGS = dev
-PROD_TAGS = prod
 LOG_TAGS =
 TEST_FLAGS =
 

From 0d9b5ecc3c34bd79bea52d56b8d2a5a7b8181947 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 30 Nov 2018 15:20:50 -0800
Subject: [PATCH 5/5] Makefile: use period for print for consistency

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2d8cf447..d3422eab 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ $(LINT_BIN):
 	GO111MODULE=off go get -u $(LINT_PKG)
 
 btcd: 
-	@$(call print, "Installing btcd...")
+	@$(call print, "Installing btcd.")
 	go get -v github.com/btcsuite/btcd/@v0.0.0-20180823030728-$(BTCD_COMMIT)
 
 # ============