File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -13,23 +13,23 @@ bundle_test_integration_cli() {
1313# subshell so that we can export PATH without breaking other things
1414(
1515 export PATH=" $DEST /../binary:$DEST /../dynbinary:$PATH "
16-
16+
1717 if ! command -v docker & > /dev/null; then
1818 echo >&2 ' error: binary or dynbinary must be run before test-integration-cli'
1919 false
2020 fi
21-
21+
2222 ( set -x; exec \
2323 docker --daemon --debug \
2424 --storage-driver " $DOCKER_GRAPHDRIVER " \
2525 --exec-driver " $DOCKER_EXECDRIVER " \
2626 --pidfile " $DEST /docker.pid" \
2727 & > " $DEST /docker.log"
2828 ) &
29-
29+
3030 # pull the busybox image before running the tests
3131 sleep 2
32-
32+
3333 if ! docker inspect busybox & > /dev/null; then
3434 if [ -d /docker-busybox ]; then
3535 ( set -x; docker build -t busybox /docker-busybox )
@@ -39,7 +39,7 @@ bundle_test_integration_cli() {
3939 fi
4040
4141 bundle_test_integration_cli
42-
42+
4343 DOCKERD_PID=$( set -x; cat $DEST /docker.pid)
4444 ( set -x; kill $DOCKERD_PID )
4545 wait $DOCKERD_PID || true
You can’t perform that action at this time.
0 commit comments