Now travis build should fail when tests fail

topfreegames · Jun 21, 2016 · 36226fd · 36226fd
1 parent 3a11f5e
commit 36226fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: go
 
 env:
   global:
-    - DOCKER_VERSION=1.10.1-0~trusty
+    - DOCKER_VERSION=1.10.3-0~trusty
     - DOCKER_COMPOSE_VERSION=1.7.1
 
 go:

diff --git a/Makefile b/Makefile
@@ -18,10 +18,13 @@ build:
 run-containers:
 	@cd test_containers && docker-compose up -d && cd ..
 
+kill-containers:
+	@cd test_containers && docker-compose stop && cd ..
+
 coverage:
 	@echo "mode: count" > coverage-all.out
 	@$(foreach pkg,$(PACKAGES),\
-		go test -coverprofile=coverage.out -covermode=count $(pkg);\
+		go test -coverprofile=coverage.out -covermode=count $(pkg) || exit 1 &&\
 		tail -n +2 coverage.out >> coverage-all.out;)
 run:
 	@go run main.go start