summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTianon Gravi <admwiggin@gmail.com>2014-06-19 15:05:42 -0600
committerTianon Gravi <admwiggin@gmail.com>2014-06-19 15:06:34 -0600
commit986a151b8afe59b33097235a5964f78fc1a55521 (patch)
tree9add1eff4a81850df7b8b1d0694c3b35272a5c09
parent2eac1c4bc5e3b77a99d94811cc481bc27b648ee0 (diff)
downloaddocker-986a151b8afe59b33097235a5964f78fc1a55521.tar.gz
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
-rwxr-xr-xhack/make.sh2
-rw-r--r--hack/make/dyntest-unit (renamed from hack/make/dyntest)4
2 files changed, 3 insertions, 3 deletions
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
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"
)