From 640682d56c9694da092e084492e3f3e96bca5c76 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 23 Oct 2013 18:27:41 -0600 Subject: [PATCH] Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS --- hack/make/dyntest | 2 +- hack/make/test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/make/dyntest b/hack/make/dyntest index 67680625e9..7de144e8db 100644 --- a/hack/make/dyntest +++ b/hack/make/dyntest @@ -22,7 +22,7 @@ bundle_test() { for test_dir in $(find_test_dirs); do ( set -x cd $test_dir - go test -i + go test -i -ldflags "$LDFLAGS" $BUILDFLAGS export TEST_DOCKERINIT_PATH=$DEST/../dynbinary/dockerinit-$VERSION go test -v -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS ) done diff --git a/hack/make/test b/hack/make/test index f905fa14a5..8acd63461d 100644 --- a/hack/make/test +++ b/hack/make/test @@ -16,7 +16,7 @@ bundle_test() { for test_dir in $(find_test_dirs); do ( set -x cd $test_dir - go test -i + go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS go test -v -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS ) done } 2>&1 | tee $DEST/test.log