Repository: hadoop Updated Branches: refs/heads/branch-2 02cdcaec5 -> 51df9e837
HADOOP-11904. test-patch.sh goes into an infinite loop on non-maven builds (aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/51df9e83 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/51df9e83 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/51df9e83 Branch: refs/heads/branch-2 Commit: 51df9e83791712fd6c12589ca6d6df7d96b42d01 Parents: 02cdcae Author: Allen Wittenauer <a...@apache.org> Authored: Tue May 5 11:05:44 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Tue May 5 11:05:56 2015 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 8 +++++++- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/51df9e83/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 5107718..9f48c64 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -915,6 +915,13 @@ function git_checkout fi add_jira_footer "git revision" "${PATCH_BRANCH} / ${GIT_REVISION}" + + if [[ ! -f ${BASEDIR}/pom.xml ]]; then + hadoop_error "ERROR: This verison of test-patch.sh only supports Maven-based builds. Aborting." + add_jira_table -1 pre-patch "Unsupported build system." + output_to_jira 1 + cleanup_and_exit 1 + fi return 0 } @@ -1331,7 +1338,6 @@ function apply_patch_file ## @return none; otherwise relaunches function check_reexec { - set +x local commentfile=${PATCH_DIR}/tp.${RANDOM} if [[ ${REEXECED} == true ]]; then http://git-wip-us.apache.org/repos/asf/hadoop/blob/51df9e83/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 34795a8..5a73826 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -149,6 +149,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11916. TestStringUtils#testLowerAndUpperStrings failed on MAC due to a JVM bug. (Ming Ma via ozawa) + HADOOP-11904. test-patch.sh goes into an infinite loop on non-maven + builds (aw) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES
