Merge pull request #4205 from tianon/fix-dyntest
Fix dyntest problems finding dockerinit
This commit is contained in:
commit
277262d9c7
|
@ -12,6 +12,6 @@ fi
|
||||||
|
|
||||||
(
|
(
|
||||||
export TEST_DOCKERINIT_PATH="$INIT"
|
export TEST_DOCKERINIT_PATH="$INIT"
|
||||||
export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\""
|
export LDFLAGS_STATIC="-X github.com/dotcloud/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\""
|
||||||
source "$(dirname "$BASH_SOURCE")/test"
|
source "$(dirname "$BASH_SOURCE")/test"
|
||||||
)
|
)
|
||||||
|
|
|
@ -12,6 +12,6 @@ fi
|
||||||
|
|
||||||
(
|
(
|
||||||
export TEST_DOCKERINIT_PATH="$INIT"
|
export TEST_DOCKERINIT_PATH="$INIT"
|
||||||
export LDFLAGS_STATIC="-X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\""
|
export LDFLAGS_STATIC="-X github.com/dotcloud/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\""
|
||||||
source "$(dirname "$BASH_SOURCE")/test-integration"
|
source "$(dirname "$BASH_SOURCE")/test-integration"
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue