From bac3a8e6f5eca31108787b98d5659523eefa6a30 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Sun, 8 Dec 2013 13:50:48 -0700 Subject: [PATCH] Add much better pruning of non-tested directories, including pruning the integration tests directory (doing more with "find" and nothing with "grep") --- hack/make/dyntest | 7 ++++--- hack/make/test | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hack/make/dyntest b/hack/make/dyntest index e6e1dbb5b2..f7290c9557 100644 --- a/hack/make/dyntest +++ b/hack/make/dyntest @@ -61,9 +61,10 @@ bundle_test() { # holding Go test files, and prints their paths on standard output, one per # line. find_test_dirs() { - find . -name '*_test.go' | grep -v '^./vendor' | - { while read f; do dirname $f; done; } | - sort -u + find -not \( \ + \( -wholename './vendor' -o -wholename './integration' \) \ + -prune \ + \) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u } bundle_test diff --git a/hack/make/test b/hack/make/test index 9ec86f0780..760c5a5fc6 100644 --- a/hack/make/test +++ b/hack/make/test @@ -53,9 +53,10 @@ bundle_test() { # holding Go test files, and prints their paths on standard output, one per # line. find_test_dirs() { - find . -name '*_test.go' | grep -v '^./vendor' | - { while read f; do dirname $f; done; } | - sort -u + find -not \( \ + \( -wholename './vendor' -o -wholename './integration' \) \ + -prune \ + \) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u } bundle_test