mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS
This commit is contained in:
parent
66a159342b
commit
640682d56c
2 changed files with 2 additions and 2 deletions
|
@ -22,7 +22,7 @@ bundle_test() {
|
||||||
for test_dir in $(find_test_dirs); do (
|
for test_dir in $(find_test_dirs); do (
|
||||||
set -x
|
set -x
|
||||||
cd $test_dir
|
cd $test_dir
|
||||||
go test -i
|
go test -i -ldflags "$LDFLAGS" $BUILDFLAGS
|
||||||
export TEST_DOCKERINIT_PATH=$DEST/../dynbinary/dockerinit-$VERSION
|
export TEST_DOCKERINIT_PATH=$DEST/../dynbinary/dockerinit-$VERSION
|
||||||
go test -v -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS
|
go test -v -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS
|
||||||
) done
|
) done
|
||||||
|
|
|
@ -16,7 +16,7 @@ bundle_test() {
|
||||||
for test_dir in $(find_test_dirs); do (
|
for test_dir in $(find_test_dirs); do (
|
||||||
set -x
|
set -x
|
||||||
cd $test_dir
|
cd $test_dir
|
||||||
go test -i
|
go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS
|
||||||
go test -v -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS
|
go test -v -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS
|
||||||
) done
|
) done
|
||||||
} 2>&1 | tee $DEST/test.log
|
} 2>&1 | tee $DEST/test.log
|
||||||
|
|
Loading…
Reference in a new issue