Merge branch 'bboreham-make-tests-stop'

Closes #557
weaveworks · Apr 14, 2015 · f9ea3f5 · f9ea3f5
2 parents 31775a8 + 8c6c14c
commit f9ea3f5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -69,14 +69,18 @@ $(DOCKER_DISTRIB):
 
 tests:
 	echo "mode: count" > profile.cov
+	fail=0 ;                                                                              \
 	for dir in $$(find . -type f -name '*_test.go' | xargs -n1 dirname | sort -u); do     \
-	    output=$$(mktemp cover.XXXXXXXXXX);                                               \
-	    go test -tags netgo -covermode=count -coverprofile=$$output $$dir;                \
+	    output=$$(mktemp cover.XXXXXXXXXX) ;                                              \
+	    if ! go test -tags netgo -covermode=count -coverprofile=$$output $$dir ; then     \
+            fail=1 ;                                                                          \
+        fi ;                                                                                  \
 	    if [ -f $$output ]; then                                                          \
 	        tail -n +2 <$$output >>profile.cov;                                           \
 	        rm $$output;                                                                  \
 	    fi                                                                                \
-	done
+	done ;                                                                                \
+	exit $$fail
 	go tool cover -html=profile.cov -o=coverage.html
 
 $(PUBLISH): publish_%: