From 68cac3d40cabed0870ad78d0d01470f18c73a981 Mon Sep 17 00:00:00 2001
From: Frank Schroeder <frank.schroeder@gmail.com>
Date: Fri, 2 Jun 2017 07:52:21 +0200
Subject: [PATCH] Revert "test: run all tests together again"

This reverts commit e48df7b57272f1075175d5bcd44746ec6eb8ca02.
---
 GNUmakefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index f621864c0d..f4baed39bc 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,7 +48,8 @@ cov:
 
 test: dev
 	go test -tags "$(GOTAGS)" -i -run '^$$' ./...
-	go test -tags "$(GOTAGS)" -v ./... > test.log 2>&1 || true
+	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
 	@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