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 zj...@apache.org on 2015/06/08 19:19:04 UTC
[06/50] hadoop git commit: HADOOP-11991. test-patch.sh isn't
re-executed even if smart-apply-patch.sh is modified. Contributed by Kengo
Seki.
HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-patch.sh is modified. Contributed by Kengo Seki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f029f9b9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f029f9b9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f029f9b9
Branch: refs/heads/YARN-2928
Commit: f029f9b95a65372ed52589e5b9c9eda53b311b6b
Parents: fb3037e
Author: Akira Ajisaka <aa...@apache.org>
Authored: Wed Jun 3 15:01:02 2015 +0900
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Jun 8 09:43:12 2015 -0700
----------------------------------------------------------------------
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/f029f9b9/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/f029f9b9/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 a0e6e90..5c1fe41 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -811,6 +811,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