"set -e" is already inherited here from make.sh, but explicit is always better than implicit (hence the "set -e" in the first place!) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
DEST=$1
DEST="$1"
@@ -1,10 +1,9 @@
INIT=$DEST/../dynbinary/dockerinit-$VERSION
-set -e
-
if [ ! -x "$INIT" ]; then
echo >&2 'error: dynbinary must be run before dyntest'
false
echo >&2 'error: dynbinary must be run before dyntest-integration'
@@ -1,9 +1,8 @@
RED=$'\033[31m'
GREEN=$'\033[32m'
TEXTRESET=$'\033[0m' # reset the foreground colour
bundle_test_integration() {
LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir ./integration \
"-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/dotcloud/docker,g' | paste -d, -s)"
DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}