Repository: hadoop Updated Branches: refs/heads/branch-2 12497b054 -> 84cae6c10
HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-patch.sh is modified. Contributed by Kengo Seki. (cherry picked from commit a6a8ee3c24e2457ce3ccc9a4a4e2535b223f547e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84cae6c1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84cae6c1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84cae6c1 Branch: refs/heads/branch-2 Commit: 84cae6c101a9dc6f9b14310d369217c561fe9e40 Parents: 12497b0 Author: Akira Ajisaka <aajis...@apache.org> Authored: Wed Jun 3 15:01:02 2015 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Wed Jun 3 15:01:52 2015 +0900 ---------------------------------------------------------------------- dev-support/test-patch.sh | 7 ++++--- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/84cae6c1/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 1409467..cd91a5c 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -1473,7 +1473,8 @@ function apply_patch_file } -## @description If this patches actually patches test-patch.sh, then +## @description If this actually patches the files used for the QA process +## @description under dev-support and its subdirectories, then ## @description run with the patched version for the test. ## @audience private ## @stability evolving @@ -1489,7 +1490,7 @@ function check_reexec fi if [[ ! ${CHANGED_FILES} =~ dev-support/test-patch - || ${CHANGED_FILES} =~ dev-support/smart-apply ]] ; then + && ! ${CHANGED_FILES} =~ dev-support/smart-apply ]] ; then return fi @@ -1510,7 +1511,7 @@ function check_reexec rm "${commentfile}" 2>/dev/null - echo "(!) A patch to test-patch or smart-apply-patch has been detected. " > "${commentfile}" + echo "(!) A patch to the files used for the QA process has been detected. " > "${commentfile}" echo "Re-executing against the patched versions to perform further tests. " >> "${commentfile}" echo "The console is at ${BUILD_URL}console in case of problems." >> "${commentfile}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/84cae6c1/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 24ad165..b466626 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -327,6 +327,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12042. Users may see TrashPolicy if hdfs dfs -rm is run (Andreina J via vinayakumarb) + HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-patch.sh + is modified. (Kengo Seki via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES
