From 78d1d60f74fa2582a4c7564756278bb92a9403d2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 12 Nov 2013 11:23:06 -0700 Subject: [PATCH] Add clarification of multiple "go test" calls in hack/make/*test Upstream-commit: 5cdb3aec507d9df7bb98366f04c4303a2172cbd5 Component: engine --- components/engine/hack/make/dyntest | 5 +++++ components/engine/hack/make/test | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/components/engine/hack/make/dyntest b/components/engine/hack/make/dyntest index 7de144e8db..ff607d3910 100644 --- a/components/engine/hack/make/dyntest +++ b/components/engine/hack/make/dyntest @@ -22,7 +22,12 @@ bundle_test() { for test_dir in $(find_test_dirs); do ( set -x cd $test_dir + + # Install packages that are dependencies of the tests. + # Note: Does not run the tests. go test -i -ldflags "$LDFLAGS" $BUILDFLAGS + + # Run the tests with the optional $TESTFLAGS. 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/components/engine/hack/make/test b/components/engine/hack/make/test index 8acd63461d..45ffe87fbd 100644 --- a/components/engine/hack/make/test +++ b/components/engine/hack/make/test @@ -16,7 +16,12 @@ bundle_test() { for test_dir in $(find_test_dirs); do ( set -x cd $test_dir + + # Install packages that are dependencies of the tests. + # Note: Does not run the tests. go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS + + # Run the tests with the optional $TESTFLAGS. go test -v -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS ) done } 2>&1 | tee $DEST/test.log