HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-pat…

…ch.sh is modified. Contributed by Kengo Seki.
serhiy · Jun 3, 2015 · a6a8ee3 · a6a8ee3
1 parent 806e407
commit a6a8ee3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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}"
 

diff --git 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