Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
| ... | ... |
@@ -23,9 +23,11 @@ set -e |
| 23 | 23 |
|
| 24 | 24 |
set -o pipefail |
| 25 | 25 |
|
| 26 |
+export DOCKER_PKG='github.com/docker/docker' |
|
| 27 |
+ |
|
| 26 | 28 |
# We're a nice, sexy, little shell script, and people might try to run us; |
| 27 | 29 |
# but really, they shouldn't. We want to be in a container! |
| 28 |
-if [ "$(pwd)" != '/go/src/github.com/docker/docker' ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then |
|
| 30 |
+if [ "$(pwd)" != "/go/src/$DOCKER_PKG" ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then |
|
| 29 | 31 |
{
|
| 30 | 32 |
echo "# WARNING! I don't seem to be running in the Docker container." |
| 31 | 33 |
echo "# The result of this command might be an incorrect build, and will not be" |
| ... | ... |
@@ -77,8 +79,8 @@ fi |
| 77 | 77 |
|
| 78 | 78 |
if [ "$AUTO_GOPATH" ]; then |
| 79 | 79 |
rm -rf .gopath |
| 80 |
- mkdir -p .gopath/src/github.com/docker |
|
| 81 |
- ln -sf ../../../.. .gopath/src/github.com/docker/docker |
|
| 80 |
+ mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")"
|
|
| 81 |
+ ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
|
|
| 82 | 82 |
export GOPATH="$(pwd)/.gopath:$(pwd)/vendor" |
| 83 | 83 |
fi |
| 84 | 84 |
|
| ... | ... |
@@ -91,8 +93,8 @@ fi |
| 91 | 91 |
# Use these flags when compiling the tests and final binary |
| 92 | 92 |
LDFLAGS=' |
| 93 | 93 |
-w |
| 94 |
- -X github.com/docker/docker/dockerversion.GITCOMMIT "'$GITCOMMIT'" |
|
| 95 |
- -X github.com/docker/docker/dockerversion.VERSION "'$VERSION'" |
|
| 94 |
+ -X '$DOCKER_PKG'/dockerversion.GITCOMMIT "'$GITCOMMIT'" |
|
| 95 |
+ -X '$DOCKER_PKG'/dockerversion.VERSION "'$VERSION'" |
|
| 96 | 96 |
' |
| 97 | 97 |
LDFLAGS_STATIC='-linkmode external' |
| 98 | 98 |
EXTLDFLAGS_STATIC='-static' |
| ... | ... |
@@ -103,7 +105,7 @@ BUILDFLAGS=( -a -tags "netgo static_build $DOCKER_BUILDTAGS" ) |
| 103 | 103 |
EXTLDFLAGS_STATIC_DOCKER="$EXTLDFLAGS_STATIC -lpthread -Wl,--unresolved-symbols=ignore-in-object-files" |
| 104 | 104 |
LDFLAGS_STATIC_DOCKER=" |
| 105 | 105 |
$LDFLAGS_STATIC |
| 106 |
- -X github.com/docker/docker/dockerversion.IAMSTATIC true |
|
| 106 |
+ -X $DOCKER_PKG/dockerversion.IAMSTATIC true |
|
| 107 | 107 |
-extldflags \"$EXTLDFLAGS_STATIC_DOCKER\" |
| 108 | 108 |
" |
| 109 | 109 |
|
| ... | ... |
@@ -150,7 +152,7 @@ go_test_dir() {
|
| 150 | 150 |
testcover=( -cover -coverprofile "$coverprofile" $coverpkg ) |
| 151 | 151 |
fi |
| 152 | 152 |
( |
| 153 |
- echo '+ go test' $TESTFLAGS "github.com/docker/docker${dir#.}"
|
|
| 153 |
+ echo '+ go test' $TESTFLAGS "${DOCKER_PKG}${dir#.}"
|
|
| 154 | 154 |
cd "$dir" |
| 155 | 155 |
go test ${testcover[@]} -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS
|
| 156 | 156 |
) |
| ... | ... |
@@ -178,7 +180,7 @@ go_compile_test_dir() {
|
| 178 | 178 |
[ $? -ne 0 ] && return 1 |
| 179 | 179 |
mkdir -p "$(dirname "$out_file")" |
| 180 | 180 |
mv "$dir/$(basename "$dir").test" "$out_file" |
| 181 |
- echo "Precompiled: github.com/dotcloud/docker${dir#.}"
|
|
| 181 |
+ echo "Precompiled: ${DOCKER_PKG}${dir#.}"
|
|
| 182 | 182 |
} |
| 183 | 183 |
|
| 184 | 184 |
# This helper function walks the current directory looking for directories |
| ... | ... |
@@ -39,7 +39,7 @@ fi |
| 39 | 39 |
# exported so that "dyntest" can easily access it later without recalculating it |
| 40 | 40 |
|
| 41 | 41 |
( |
| 42 |
- export LDFLAGS_STATIC_DOCKER="-X github.com/docker/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X github.com/docker/docker/dockerversion.INITPATH \"$DOCKER_INITPATH\"" |
|
| 42 |
+ export LDFLAGS_STATIC_DOCKER="-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X $DOCKER_PKG/dockerversion.INITPATH \"$DOCKER_INITPATH\"" |
|
| 43 | 43 |
export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
|
| 44 | 44 |
source "$(dirname "$BASH_SOURCE")/binary" |
| 45 | 45 |
) |
| ... | ... |
@@ -12,7 +12,7 @@ fi |
| 12 | 12 |
( |
| 13 | 13 |
export TEST_DOCKERINIT_PATH="$INIT" |
| 14 | 14 |
export LDFLAGS_STATIC_DOCKER=" |
| 15 |
- -X github.com/docker/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" |
|
| 15 |
+ -X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" |
|
| 16 | 16 |
" |
| 17 | 17 |
source "$(dirname "$BASH_SOURCE")/test-integration" |
| 18 | 18 |
) |
| ... | ... |
@@ -12,7 +12,7 @@ fi |
| 12 | 12 |
( |
| 13 | 13 |
export TEST_DOCKERINIT_PATH="$INIT" |
| 14 | 14 |
export LDFLAGS_STATIC_DOCKER=" |
| 15 |
- -X github.com/docker/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" |
|
| 15 |
+ -X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" |
|
| 16 | 16 |
" |
| 17 | 17 |
source "$(dirname "$BASH_SOURCE")/test-unit" |
| 18 | 18 |
) |
| ... | ... |
@@ -5,7 +5,7 @@ DEST=$1 |
| 5 | 5 |
|
| 6 | 6 |
bundle_test_integration() {
|
| 7 | 7 |
LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir ./integration \ |
| 8 |
- "-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/docker/docker,g' | paste -d, -s)" |
|
| 8 |
+ "-coverpkg $(find_dirs '*.go' | sed 's,^\.,'$DOCKER_PKG',g' | paste -d, -s)" |
|
| 9 | 9 |
} |
| 10 | 10 |
|
| 11 | 11 |
# this "grep" hides some really irritating warnings that "go test -coverpkg" |
| ... | ... |
@@ -54,7 +54,7 @@ go_run_test_dir() {
|
| 54 | 54 |
TESTS_FAILED=() |
| 55 | 55 |
while read dir; do |
| 56 | 56 |
echo |
| 57 |
- echo '+ go test' $TESTFLAGS "github.com/dotcloud/docker${dir#.}"
|
|
| 57 |
+ echo '+ go test' $TESTFLAGS "${DOCKER_PKG}${dir#.}"
|
|
| 58 | 58 |
precompiled="$DEST/precompiled/$dir.test" |
| 59 | 59 |
if ! ( cd "$dir" && "$precompiled" ); then |
| 60 | 60 |
TESTS_FAILED+=("$dir")
|