You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2016/04/17 19:14:59 UTC
[11/23] yetus git commit: YETUS-357. build driver for hadoop
shouldn't union unit tests
YETUS-357. build driver for hadoop shouldn't union unit tests
Signed-off-by: Allen Wittenauer <aw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/606f816c
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/606f816c
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/606f816c
Branch: refs/heads/YETUS-156
Commit: 606f816c02b26dc5f472696e629077bec8cd969e
Parents: 1d628e0
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Apr 12 09:03:20 2016 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Sun Apr 17 10:14:34 2016 -0700
----------------------------------------------------------------------
precommit/personality/hadoop.sh | 10 ++++++++--
precommit/test-patch.d/maven.sh | 10 ++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/606f816c/precommit/personality/hadoop.sh
----------------------------------------------------------------------
diff --git a/precommit/personality/hadoop.sh b/precommit/personality/hadoop.sh
index d23b6be..5b96994 100755
--- a/precommit/personality/hadoop.sh
+++ b/precommit/personality/hadoop.sh
@@ -46,8 +46,12 @@ function hadoop_order
if [[ ${ordering} = normal ]]; then
hadoopm="${CHANGED_MODULES[*]}"
- elif [[ ${ordering} = union ]]; then
+ elif [[ ${ordering} = union ]]; then
hadoopm="${CHANGED_UNION_MODULES}"
+ elif [[ ${ordering} = mvnsrc ]]; then
+ hadoopm="${MAVEN_SRC_MODULES[*]}"
+ elif [[ ${ordering} = mvnsrctest ]]; then
+ hadoopm="${MAVEN_SRCTEST_MODULES[*]}"
else
hadoopm="${ordering}"
fi
@@ -236,7 +240,9 @@ function personality_modules
fi
;;
unit)
- if [[ "${CHANGED_MODULES[*]}" =~ \. ]]; then
+ if [[ "${BUILDMODE}" = full ]]; then
+ ordering=mvnsrc
+ elif [[ "${CHANGED_MODULES[*]}" =~ \. ]]; then
ordering=.
fi
http://git-wip-us.apache.org/repos/asf/yetus/blob/606f816c/precommit/test-patch.d/maven.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/maven.sh b/precommit/test-patch.d/maven.sh
index 32f4b37..77aab32 100755
--- a/precommit/test-patch.d/maven.sh
+++ b/precommit/test-patch.d/maven.sh
@@ -685,6 +685,16 @@ function maven_reorder_modules
yetus_debug "Maven: finish re-ordering modules"
yetus_debug "Finished list: ${CHANGED_MODULES[*]}"
+ # build some utility module lists for maven modules
+ for index in "${CHANGED_MODULES[@]}"; do
+ if [[ -d "${index}/src" ]]; then
+ MAVEN_SRC_MODULES=("${MAVEN_SRC_MODULES[@]}" "${index}")
+ if [[ -d "${index}/src/test" ]]; then
+ MAVEN_SRCTEST_MODULES=("${MAVEN_SRCTEST_MODULES[@]}" "${index}")
+ fi
+ fi
+ done
+
if [[ "${BUILDMODE}" = patch ]]; then
add_vote_table 0 mvndep "Maven dependency ordering for ${repostatus}"
else