Browse code
Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS
Tianon Gravi authored on 2013/10/24 09:27:41Showing 2 changed files
| ... | ... |
@@ -22,7 +22,7 @@ bundle_test() {
|
| 22 | 22 |
for test_dir in $(find_test_dirs); do ( |
| 23 | 23 |
set -x |
| 24 | 24 |
cd $test_dir |
| 25 |
- go test -i |
|
| 25 |
+ go test -i -ldflags "$LDFLAGS" $BUILDFLAGS |
|
| 26 | 26 |
export TEST_DOCKERINIT_PATH=$DEST/../dynbinary/dockerinit-$VERSION |
| 27 | 27 |
go test -v -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS |
| 28 | 28 |
) done |
| ... | ... |
@@ -16,7 +16,7 @@ bundle_test() {
|
| 16 | 16 |
for test_dir in $(find_test_dirs); do ( |
| 17 | 17 |
set -x |
| 18 | 18 |
cd $test_dir |
| 19 |
- go test -i |
|
| 19 |
+ go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS |
|
| 20 | 20 |
go test -v -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS |
| 21 | 21 |
) done |
| 22 | 22 |
} 2>&1 | tee $DEST/test.log |