From e48df7b57272f1075175d5bcd44746ec6eb8ca02 Mon Sep 17 00:00:00 2001
From: Frank Schroeder <frank.schroeder@gmail.com>
Date: Wed, 31 May 2017 10:00:10 +0200
Subject: [PATCH] test: run all tests together again

Looks like I have eliminated the troublesome tests for now.
---
 GNUmakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index f4baed39bc..f621864c0d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,8 +48,7 @@ cov:
 
 test: dev
 	go test -tags "$(GOTAGS)" -i -run '^$$' ./...
-	go test -tags "$(GOTAGS)" -v $$(go list ./... | egrep -v '(consul/consul|vendor)') > test.log 2>&1 || true
-	go test -tags "$(GOTAGS)" -v github.com/hashicorp/consul/consul >> test.log 2>&1 || true
+	go test -tags "$(GOTAGS)" -v ./... > test.log 2>&1 || true
 	@if [ "$$TRAVIS" == "true" ] ; then cat test.log ; fi
 	@if grep -q 'FAIL:' test.log ; then grep 'FAIL:' test.log ; exit 1 ; else echo 'PASS' ; fi