Return-Path: X-Original-To: apmail-yetus-commits-archive@minotaur.apache.org Delivered-To: apmail-yetus-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E42B618873 for ; Wed, 28 Oct 2015 15:27:19 +0000 (UTC) Received: (qmail 38660 invoked by uid 500); 28 Oct 2015 15:27:19 -0000 Delivered-To: apmail-yetus-commits-archive@yetus.apache.org Received: (qmail 38621 invoked by uid 500); 28 Oct 2015 15:27:19 -0000 Mailing-List: contact commits-help@yetus.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@yetus.apache.org Delivered-To: mailing list commits@yetus.apache.org Received: (qmail 38433 invoked by uid 99); 28 Oct 2015 15:27:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 15:27:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 290D2E00D8; Wed, 28 Oct 2015 15:27:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: commits@yetus.apache.org Date: Wed, 28 Oct 2015 15:27:31 -0000 Message-Id: <07b8592c4e9642da8585d9c5379fad61@git.apache.org> In-Reply-To: <5fab810888f74cffb940146c409c2eb3@git.apache.org> References: <5fab810888f74cffb940146c409c2eb3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/14] yetus git commit: YETUS-138. Skipping maven poms that don't package causes testing holes (aw) YETUS-138. Skipping maven poms that don't package causes testing holes (aw) Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/67f42f1a Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/67f42f1a Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/67f42f1a Branch: refs/heads/YETUS-83 Commit: 67f42f1ae37166bdd5f3d61edbae018645888c37 Parents: 3fc742e Author: Allen Wittenauer Authored: Tue Oct 27 14:51:30 2015 -0700 Committer: Allen Wittenauer Committed: Wed Oct 28 08:23:37 2015 -0700 ---------------------------------------------------------------------- .../documentation/latest/precommit-advanced.md | 2 -- precommit/test-patch.sh | 27 +++++--------------- 2 files changed, 6 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/67f42f1a/asf-site-src/source/documentation/latest/precommit-advanced.md ---------------------------------------------------------------------- diff --git a/asf-site-src/source/documentation/latest/precommit-advanced.md b/asf-site-src/source/documentation/latest/precommit-advanced.md index f68db7a..9b068b6 100644 --- a/asf-site-src/source/documentation/latest/precommit-advanced.md +++ b/asf-site-src/source/documentation/latest/precommit-advanced.md @@ -226,8 +226,6 @@ There are a handful of extremely important system variables that make life easie * CHANGED\_FILES is a list of all files that appear to be added, deleted, or modified in the patch. -* CHANGED\_UNFILTERED\_MODULES is a list of all modules that house all of the CHANGED\_FILES. Be aware that the root of the source tree is reported as '.'. - * CHANGED\_MODULES reports which modules that appear to have source code in them. * GITHUB\_REPO is to help test-patch when talking to Github. If test-patch is given just a number on the command line, it will default to using this repo to determine the pull request. http://git-wip-us.apache.org/repos/asf/yetus/blob/67f42f1a/precommit/test-patch.sh ---------------------------------------------------------------------- diff --git a/precommit/test-patch.sh b/precommit/test-patch.sh index 93874a2..709c8b7 100755 --- a/precommit/test-patch.sh +++ b/precommit/test-patch.sh @@ -70,8 +70,7 @@ function setup_defaults # shellcheck disable=SC2034 CHANGED_MODULES="" - # shellcheck disable=SC2034 - CHANGED_UNFILTERED_MODULES="" + # shellcheck disable=SC2034 CHANGED_UNION_MODULES="" USER_MODULE_LIST="" @@ -320,6 +319,8 @@ function finish_footer_table { local maxmem + add_footer_table "modules" "C: ${CHANGED_MODULES} U: ${CHANGED_UNION_MODULES}" + # `sort | head` can cause a broken pipe error, but we can ignore it just like compute_gitdiff. # shellcheck disable=SC2016,SC2086 maxmem=$(find "${PATCH_DIR}" -type f -exec ${AWK} 'match($0, /^\[INFO\] Final Memory: [0-9]+/) @@ -997,7 +998,7 @@ function module_skipdir ## @audience private ## @stability stable ## @replaceable no -## @return None; sets ${CHANGED_MODULES} and ${CHANGED_UNFILTERED_MODULES} +## @return None; sets ${CHANGED_MODULES} function find_changed_modules { local i @@ -1044,24 +1045,8 @@ function find_changed_modules fi #shellcheck disable=SC2086,SC2034 - CHANGED_UNFILTERED_MODULES=$(echo ${builddirs} ${USER_MODULE_LIST} | tr ' ' '\n' | sort -u) - #shellcheck disable=SC2086,SC2116 - CHANGED_UNFILTERED_MODULES=$(echo ${CHANGED_UNFILTERED_MODULES}) - - if [[ ${BUILDTOOL} = maven ]]; then - # Filter out modules without code - for module in ${builddirs}; do - ${GREP} "pom" "${module}/pom.xml" > /dev/null - if [[ "$?" != 0 ]]; then - buildmods="${buildmods} ${module}" - fi - done - else - buildmods=${CHANGED_UNFILTERED_MODULES} - fi - - #shellcheck disable=SC2086,SC2034 - CHANGED_MODULES=$(echo ${buildmods} ${USER_MODULE_LIST} | tr ' ' '\n' | sort -u) + CHANGED_MODULES=$(echo ${builddirs} ${USER_MODULE_LIST} | tr ' ' '\n' | sort -u) + CHANGED_MODULES=$(echo ${CHANGED_MODULES} ${USER_MODULE_LIST} | tr ' ' '\n' | sort -u) # turn it back into a list so that anyone printing doesn't # generate multiline output