HADOOP-11951. test-patch should give better info about failures to handle dev-support updates without resetrepo option (Sean Busbey via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ab597d09 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab597d09 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab597d09 Branch: refs/heads/YARN-2928 Commit: ab597d09e32af68e0b80d808ccdeb257450f0b35 Parents: c08d736 Author: Allen Wittenauer <a...@apache.org> Authored: Mon May 11 11:45:47 2015 -0700 Committer: Zhijie Shen <zjs...@apache.org> Committed: Tue May 12 13:24:13 2015 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 8 ++++++++ hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab597d09/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index a3ce567..11fd9a9 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -1446,6 +1446,14 @@ function check_reexec fi big_console_header "dev-support patch detected" + + if [[ ${RESETREPO} == false ]]; then + ((RESULT = RESULT + 1)) + hadoop_debug "can't destructively change the working directory. run with '--resetrepo' please. :(" + add_jira_table -1 dev-support "Couldn't test dev-support changes because we aren't configured to destructively change the working directory." + return + fi + printf "\n\nRe-executing against patched versions to test.\n\n" apply_patch_file http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab597d09/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 929ada1..f237b85 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -656,6 +656,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11928. Test-patch check for @author tags incorrectly flags removal of @author tags (Kengo Seki via aw) + HADOOP-11951. test-patch should give better info about failures to handle + dev-support updates without resetrepo option (Sean Busbey via aw) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES