Cleanup from CR.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0acfccc7be6c49bf243821e535dfe1122ff5a52
Component: engine
This commit is contained in:
Daniel Nephin
2016-04-22 12:37:48 -04:00
parent dcd6f9747a
commit f856b40438
7 changed files with 69 additions and 40 deletions

View File

@ -188,7 +188,7 @@ if [ $ec -eq 0 ]; then
ec=$?
set +x
if [ 0 -ne $ec ]; then
echo "ERROR: Failed to compile and start the linux daemon"
echo "ERROR: Failed to compile and start the linux daemon"
fi
fi
@ -199,7 +199,7 @@ if [ $ec -eq 0 ]; then
export TIMEOUT="5m"
export DOCKER_HOST="tcp://$ip:$port_inner"
export DOCKER_TEST_HOST="tcp://$ip:$port_inner"
unset DOCKER_CLIENTONLY
unset DOCKER_CLIENTONLY
export DOCKER_REMOTE_DAEMON=1
hack/make.sh binary
ec=$?