clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

hack: explicit bundles for integration-cli prequisites

Browse Source 
no longer load hide critical code such as in .integration-daemon-{start,stop},
if this step failed, it will had logged the corresponding module before:

---> Making bundle: .integration-daemon-start (in bundles/1.7.0-dev/daemon-start)

which is nicer to debug.

This will make it also easier to execute a single tests in an interactive shell.

$ make shell
docker> . hack/make.sh binary .integration-daemon-start .integration-daemon-setup
docker> docker ps
CONTAINER ID        IMAGE               COMMAND             CREATED STATUS              PORTS               NAMES
docker> go test github.com/docker/docker/integration-cli

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
This commit is contained in:
Jörg Thalheim
2015-06-09 07:22:26 +02:00
parent ef3e956aa2
commit 2b4facdf2e
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hack/make/test-integration-cli
+3 -5
View File
@@ -7,13 +7,11 @@ bundle_test_integration_cli() {
# subshell so that we can export PATH without breaking other things
(
source "${MAKEDIR}/.integration-daemon-start"
bundle .integration-daemon-start
source "${MAKEDIR}/.ensure-frozen-images"
source "${MAKEDIR}/.ensure-httpserver"
source "${MAKEDIR}/.ensure-emptyfs"
bundle .integration-daemon-setup
bundle_test_integration_cli
source "${MAKEDIR}/.integration-daemon-stop"
bundle .integration-daemon-stop
) 2>&1 | tee -a "$DEST/test.log"