From e416f828dc47b08d6e076ad8944b6bce2f3de128 Mon Sep 17 00:00:00 2001
From: Paul Banks <banks@banksco.de>
Date: Tue, 20 Feb 2018 13:16:53 +0000
Subject: [PATCH] Output from test as we run to stop travis killing us and try
 no parallelism to avoid timing issues on their contended CPUs

---
 .travis.yml | 2 +-
 GNUmakefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7d99c9bd3d..d56c6f3ff8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ branches:
     - master
 
 script:
-  - GOTEST_FLAGS="-p 2 -parallel 2" make test
+  - GOTEST_FLAGS="-p 1 -parallel 1" make test
 
 sudo: false
diff --git a/GNUmakefile b/GNUmakefile
index 47d8a4dcf6..2e8bb12d41 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -67,7 +67,7 @@ test: other-consul dev-build vet
 	@echo "--> Running go test"
 	@rm -f test.log exit-code
 	go test -tags '$(GOTAGS)' -i ./...
-	go test $(GOTEST_FLAGS) -tags '$(GOTAGS)' -timeout 5m -v ./... &>test.log ; echo $$? > exit-code
+	{ go test $(GOTEST_FLAGS) -tags '$(GOTAGS)' -timeout 5m -v ./... 2>&1 ; echo $$? > exit-code ; } | tee test.log
 	@echo "Exit code: $$(cat exit-code)" >> test.log
 	@grep -A5 'DATA RACE' test.log || true
 	@grep -A10 'panic: test timed out' test.log || true