docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update some whitespace in hack/make/test-integration-cli for consistency 

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-04-28 22:22:31 -06:00
parent af72ca199d
commit e4114e6b94
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/make/test-integration-cli
View File

@ -13,12 +13,12 @@ bundle_test_integration_cli() {
# subshell so that we can export PATH without breaking other things # subshell so that we can export PATH without breaking other things
( (
export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH" export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH"
if ! command -v docker &> /dev/null; then if ! command -v docker &> /dev/null; then
echo >&2 'error: binary or dynbinary must be run before test-integration-cli' echo >&2 'error: binary or dynbinary must be run before test-integration-cli'
false false
fi fi
( set -x; exec \ ( set -x; exec \
docker --daemon --debug \ docker --daemon --debug \
--storage-driver "$DOCKER_GRAPHDRIVER" \ --storage-driver "$DOCKER_GRAPHDRIVER" \
@ -26,10 +26,10 @@ bundle_test_integration_cli() {
--pidfile "$DEST/docker.pid" \ --pidfile "$DEST/docker.pid" \
&> "$DEST/docker.log" &> "$DEST/docker.log"
) & ) &
# pull the busybox image before running the tests # pull the busybox image before running the tests
sleep 2 sleep 2
if ! docker inspect busybox &> /dev/null; then if ! docker inspect busybox &> /dev/null; then
if [ -d /docker-busybox ]; then if [ -d /docker-busybox ]; then
( set -x; docker build -t busybox /docker-busybox ) ( set -x; docker build -t busybox /docker-busybox )
@ -39,7 +39,7 @@ bundle_test_integration_cli() {
fi fi
bundle_test_integration_cli bundle_test_integration_cli
DOCKERD_PID=$(set -x; cat $DEST/docker.pid) DOCKERD_PID=$(set -x; cat $DEST/docker.pid)
( set -x; kill $DOCKERD_PID ) ( set -x; kill $DOCKERD_PID )
wait $DOCKERD_PID || true wait $DOCKERD_PID || true