From e1c48fa56007e1db028f7f83bfbf79c3d05feccd Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 12 Mar 2014 01:17:38 -0600 Subject: [PATCH 1/2] Clean up the "go test" output from "make test" to be much more readable/scannable Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- hack/make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make.sh b/hack/make.sh index 63edca4d4c..d7f8aaeed2 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -125,7 +125,7 @@ go_test_dir() { testcover=( -cover -coverprofile "$coverprofile" $coverpkg ) fi ( - set -x + echo '+ go test' $TESTFLAGS "github.com/dotcloud/docker${dir#.}" cd "$dir" go test ${testcover[@]} -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS ) From 99b6364790e59a70d57949792fa31014637c93ee Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 12 Mar 2014 01:18:12 -0600 Subject: [PATCH 2/2] Exclude more "definitely not unit tested Go source code" directories from hack/make/test Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- hack/make.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hack/make.sh b/hack/make.sh index d7f8aaeed2..994da8d9ad 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -136,7 +136,15 @@ go_test_dir() { # output, one per line. find_dirs() { find -not \( \ - \( -wholename './vendor' -o -wholename './integration' -o -wholename './contrib' -o -wholename './pkg/mflag/example' \) \ + \( \ + -wholename './vendor' \ + -o -wholename './integration' \ + -o -wholename './contrib' \ + -o -wholename './pkg/mflag/example' \ + -o -wholename './.git' \ + -o -wholename './bundles' \ + -o -wholename './docs' \ + \) \ -prune \ \) -name "$1" -print0 | xargs -0n1 dirname | sort -u }