toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli integration: allow driver selection via vars

Browse Source 
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 62b08f557db91cc5cd12ea9ceb0a4d8cf3d6e0f1
Component: engine
This commit is contained in:
unclejack
2014-04-04 19:03:07 +03:00
parent b8c51a787b
commit 3057a30784
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/hack/make/test-integration-cli
View File

@ -7,6 +7,8 @@ set -e
# subshell so that we can export PATH without breaking other things
(
export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH"
DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}
bundle_test_integration_cli() {
go_test_dir ./integration-cli
@ -17,7 +19,8 @@ if ! command -v docker &> /dev/null; then
false
fi
docker -d -D -p $DEST/docker.pid &> $DEST/docker.log &
echo "running cli integration tests using graphdriver: '$DOCKER_GRAPHDRIVER' and execdriver: '$DOCKER_EXECDRIVER'"
docker -d -D -s $DOCKER_GRAPHDRIVER -e $DOCKER_EXECDRIVER -p $DEST/docker.pid &> $DEST/docker.log &
# pull the busybox image before running the tests
sleep 2