Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS

Upstream-commit: 640682d56c9694da092e084492e3f3e96bca5c76
Component: engine

components/engine/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

components/engine/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