Merge pull request #2028 from dmp42/02-build-fixes

Minor cleanup and fix #2022

Makefile

@@ -10,25 +10,27 @@ else
 DOCKER_IMAGE_NAME := "docker-machine-build"
 DOCKER_CONTAINER_NAME := "docker-machine-build-container"
 
-build:
-test: build
+.ignore:
+	@
+
+test: .ignore
 %:
 		docker build -t $(DOCKER_IMAGE_NAME) .
 
 		test -z '$(shell docker ps -a | grep $(DOCKER_CONTAINER_NAME))' || docker rm -f $(DOCKER_CONTAINER_NAME)
 
 		docker run --name $(DOCKER_CONTAINER_NAME) \
-		    -e DEBUG \
-		    -e STATIC \
-		    -e VERBOSE \
-		    -e BUILDTAGS \
-		    -e PARALLEL \
-		    -e COVERAGE_DIR \
-		    -e TARGET_OS \
-		    -e TARGET_ARCH \
-		    -e PREFIX \
-		    $(DOCKER_IMAGE_NAME) \
-		    make $@
+				-e DEBUG \
+				-e STATIC \
+				-e VERBOSE \
+				-e BUILDTAGS \
+				-e PARALLEL \
+				-e COVERAGE_DIR \
+				-e TARGET_OS \
+				-e TARGET_ARCH \
+				-e PREFIX \
+				$(DOCKER_IMAGE_NAME) \
+				make $@
 
 		test ! -d bin || rm -Rf bin
 		test -z "$(findstring build,$(patsubst cross,build,$@))" || docker cp $(DOCKER_CONTAINER_NAME):/go/src/github.com/docker/machine/bin bin

cli/.travis.yml

@@ -10,4 +10,4 @@ go:
 
 script:
 - go vet ./...
-- go test -race -v ./libmachine/... ./commands/... ./drivers/...
+- go test -race -v ./...

mk/main.mk

@@ -3,7 +3,7 @@ GO_LDFLAGS := -X `go list ./version`.GitCommit=`git rev-parse --short HEAD`
 GO_GCFLAGS :=
 
 # Full package list
-PKGS := $(shell go list -tags "$(BUILDTAGS)" ./commands/... ./libmachine/... ./drivers/... | grep -v "/vendor/" | grep -v "/Godeps/")
+PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/Godeps/" | grep -v "/cmd")
 
 # Support go1.5 vendoring (let us avoid messing with GOPATH or using godep)
 export GO15VENDOREXPERIMENT = 1
@@ -32,7 +32,6 @@ VERBOSE_GO :=
 GO := go
 ifeq ($(VERBOSE),true)
 	VERBOSE_GO := -v
-	GO := go
 endif
 
 include mk/build.mk
@@ -58,9 +57,7 @@ plugins: build-plugins
 cross: build-x
 
 clean: coverage-clean build-clean
-test: dco fmt vet test-short
+test: dco fmt test-short vet
 validate: dco fmt vet lint test-short test-long
-install:
-	cp ./bin/docker-machine* /usr/local/bin/
 
 .PHONY: .all_build .all_coverage .all_release .all_test .all_validate test build validate clean

mk/release.mk

@@ -17,8 +17,6 @@ release: clean dco fmt test test-long build-x release-pack release-checksum
 	$(if $(VERSION), , \
 		$(error Pass the version number as the first arg. E.g.: make release 1.2.3))
 
-	echo $(VERSION)
-
 	git tag $(VERSION)
 	git push --tags
 

script/test

@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-ARGS=$@
-if [ -z "$ARGS" ]; then
-    ARGS="./libmachine/... ./commands/... ./drivers/..."
-fi
-
-echo $ARGS
-
-docker build -t docker-machine .
-exec docker run --rm docker-machine godep go test -race -v -short $ARGS