You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2015/05/05 20:03:57 UTC
hadoop git commit: HADOOP-11904. test-patch.sh goes into an infinite
loop on non-maven builds (aw)
Repository: hadoop
Updated Branches:
refs/heads/trunk fcd4cb751 -> 3ff91e9e9
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/3ff91e9e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ff91e9e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ff91e9e
Branch: refs/heads/trunk
Commit: 3ff91e9e9302d94b0d18cccebd02d3815c06ce90
Parents: fcd4cb7
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue May 5 11:02:15 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Tue May 5 11:02:15 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/3ff91e9e/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/3ff91e9e/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 49106ae..5b2654a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -604,6 +604,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