Merge branch 'travis-run-tests'

zlabjp · Jan 6, 2017 · 7289b21 · 7289b21
2 parents 2d77842 + 9840dc4
commit 7289b21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ go:
 services:
 - docker
 script:
+- make check
 - make controller
 - docker build -t zlabjp/nghttpx-ingress-controller .
 after_success:

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ ifndef VERSION
   VERSION := git-$(shell git rev-parse --short HEAD)
 endif
 
-.PHONY: controller container push clean vet fmt
+.PHONY: controller container push clean vet fmt check
 
 controller: clean
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags \
@@ -32,3 +32,6 @@ vet:
 
 fmt:
 	go fmt github.com/zlabjp/nghttpx-ingress-lb/pkg/...
+
+check:
+	go test github.com/zlabjp/nghttpx-ingress-lb/pkg/...