initial version of cli integration tests

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

hack/make.sh

@@ -139,6 +139,7 @@ find_dirs() {
 		\( \
 			-wholename './vendor' \
 			-o -wholename './integration' \
+			-o -wholename './integration-cli' \
 			-o -wholename './contrib' \
 			-o -wholename './pkg/mflag/example' \
 			-o -wholename './.git' \

hack/make/test-integration-cli

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+DEST=$1
+DOCKERBIN=$DEST/../binary/docker-$VERSION
+DYNDOCKERBIN=$DEST/../dynbinary/docker-$VERSION
+DOCKERINITBIN=$DEST/../dynbinary/dockerinit-$VERSION
+
+set -e
+
+bundle_test_integration_cli() {
+	go_test_dir ./integration-cli
+}
+
+if [ -x "/usr/bin/docker" ]; then
+	echo "docker found at /usr/bin/docker"
+elif [ -x "$DOCKERBIN" ]; then
+	ln -s $DOCKERBIN /usr/bin/docker
+elif [ -x "$DYNDOCKERBIN" ]; then
+	ln -s $DYNDOCKERBIN /usr/bin/docker
+	ln -s $DOCKERINITBIN /usr/bin/dockerinit
+else
+	echo >&2 'error: binary or dynbinary must be run before test-integration-cli'
+	false
+fi
+
+
+docker -d -D -p $DEST/docker.pid &> $DEST/docker.log &
+sleep 2
+docker info
+DOCKERD_PID=`cat $DEST/docker.pid`
+
+bundle_test_integration_cli 2>&1 \
+	| tee $DEST/test.log
+
+kill $DOCKERD_PID
+wait $DOCKERD_PID
+