Merge pull request #534 from aboch/t

Make integration-tests an indipendent target

libnetwork/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all all-local build build-local check check-code check-format run-tests check-local integration-tests install-deps coveralls circle-ci start-services
+.PHONY: all all-local build build-local check check-code check-format run-tests check-local integration-tests install-deps coveralls circle-ci start-services clean
 SHELL=/bin/bash
 build_image=libnetwork-build
 dockerargs = --privileged -v $(shell pwd):/go/src/github.com/docker/libnetwork -w /go/src/github.com/docker/libnetwork
@@ -7,9 +7,9 @@ docker = docker run --rm -it ${dockerargs} ${container_env} ${build_image}
 ciargs = -e "COVERALLS_TOKEN=$$COVERALLS_TOKEN" -e "INSIDECONTAINER=-incontainer=true"
 cidocker = docker run ${ciargs} ${dockerargs} golang:1.4
 
-all: ${build_image}.created build check integration-tests
+all: ${build_image}.created build check integration-tests clean
 
-integration-tests:
+integration-tests: ./cmd/dnet/dnet
 	@if [ ! -d ./integration-tmp ]; then \
 	    mkdir -p ./integration-tmp;	\
 	    git clone https://github.com/sstephenson/bats.git ./integration-tmp/bats; \
@@ -17,6 +17,15 @@ integration-tests:
 	fi
 	@./integration-tmp/bin/bats ./test/integration/dnet
 
+./cmd/dnet/dnet:
+	make build-local
+
+clean:
+	@if [ -e ./cmd/dnet/dnet ]; then \
+		echo "Removing dnet binary"; \
+		rm -rf ./cmd/dnet/dnet; \
+	fi
+
 all-local: check-local build-local
 
 ${build_image}.created: