Merge pull request docker#16 from gdevillele/pr-add-test-target

add “test” target to makefiles
aslamahemad · Apr 28, 2017 · 2075433 · 2075433
2 parents e8d0ecd + 4d4203f
commit 2075433
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -12,6 +12,11 @@ build: clean
 clean:
 	@rm -rf ./build
 
+# run go test
+# the "-tags daemon" part is temporary
+test:
+	@go test -tags daemon -v $(shell go list ./... | grep -v /vendor/)
+
 # build the CLI for multiple architectures
 cross: clean
 	@gox -output build/docker-{{.OS}}-{{.Arch}} \

diff --git a/docker.Makefile b/docker.Makefile
@@ -21,6 +21,10 @@ build: build_docker_image
 clean: build_docker_image
 	@docker run --rm -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) make clean
 
+# run go test
+test: build_docker_image
+	@docker run --rm -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) make test
+
 # build the CLI for multiple architectures using a container
 cross: build_docker_image
 	@docker run --rm -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) make cross

diff --git a/dockerfiles/Dockerfile.ci b/dockerfiles/Dockerfile.ci
@@ -25,5 +25,6 @@ ENV     CGO_ENABLED=0
 WORKDIR /go/src/github.com/docker/cli
 
 RUN     make cross
+RUN     make test
 
 CMD     sh