From 986a151b8afe59b33097235a5964f78fc1a55521 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 19 Jun 2014 15:05:42 -0600 Subject: [PATCH] Fix dyntest and rename it to dyntest-unit to match the test-unit rename Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- hack/make.sh | 2 +- hack/make/{dyntest => dyntest-unit} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename hack/make/{dyntest => dyntest-unit} (71%) diff --git a/hack/make.sh b/hack/make.sh index cc5582a8df..d5bcfcfbc0 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -50,7 +50,7 @@ DEFAULT_BUNDLES=( test-integration-cli dynbinary - dyntest + dyntest-unit dyntest-integration cover diff --git a/hack/make/dyntest b/hack/make/dyntest-unit similarity index 71% rename from hack/make/dyntest rename to hack/make/dyntest-unit index 56f624b1f5..ce934f1849 100644 --- a/hack/make/dyntest +++ b/hack/make/dyntest-unit @@ -5,7 +5,7 @@ DEST=$1 INIT=$DEST/../dynbinary/dockerinit-$VERSION if [ ! -x "$INIT" ]; then - echo >&2 'error: dynbinary must be run before dyntest' + echo >&2 'error: dynbinary must be run before dyntest-unit' false fi @@ -14,5 +14,5 @@ fi export LDFLAGS_STATIC_DOCKER=" -X github.com/dotcloud/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" " - source "$(dirname "$BASH_SOURCE")/test" + source "$(dirname "$BASH_SOURCE")/test-unit" )