Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
This commit is contained in:
parent
ca405786f4
commit
f0879a1e14
2
Makefile
2
Makefile
|
@ -14,7 +14,7 @@ doc:
|
||||||
docker build -t docker-docs docs && docker run -p 8000:8000 docker-docs
|
docker build -t docker-docs docs && docker run -p 8000:8000 docker-docs
|
||||||
|
|
||||||
test: build
|
test: build
|
||||||
$(DOCKER_RUN_DOCKER) hack/make.sh test
|
$(DOCKER_RUN_DOCKER) hack/make.sh test test-integration
|
||||||
|
|
||||||
shell: build
|
shell: build
|
||||||
$(DOCKER_RUN_DOCKER) bash
|
$(DOCKER_RUN_DOCKER) bash
|
||||||
|
|
|
@ -35,8 +35,10 @@ grep -q "$RESOLVCONF" /proc/mounts || {
|
||||||
DEFAULT_BUNDLES=(
|
DEFAULT_BUNDLES=(
|
||||||
binary
|
binary
|
||||||
test
|
test
|
||||||
|
test-integration
|
||||||
dynbinary
|
dynbinary
|
||||||
dyntest
|
dyntest
|
||||||
|
dyntest-integration
|
||||||
tgz
|
tgz
|
||||||
ubuntu
|
ubuntu
|
||||||
)
|
)
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
DEST=$1
|
||||||
|
INIT=$DEST/../dynbinary/dockerinit-$VERSION
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ ! -x "$INIT" ]; then
|
||||||
|
echo >&2 'error: dynbinary must be run before dyntest-integration'
|
||||||
|
false
|
||||||
|
fi
|
||||||
|
|
||||||
|
(
|
||||||
|
export TEST_DOCKERINIT_PATH="$INIT"
|
||||||
|
export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\""
|
||||||
|
source "$(dirname "$BASH_SOURCE")/test-integration"
|
||||||
|
)
|
|
@ -0,0 +1,11 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
DEST=$1
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
bundle_test_integration() {
|
||||||
|
LDFLAGS="$LDFLAGS $LDFLAGS_STATIC" go_test_dir ./integration
|
||||||
|
}
|
||||||
|
|
||||||
|
bundle_test_integration 2>&1 | tee $DEST/test.log
|
Loading…
Reference in New Issue