From 03c950d9077f68f1f86d07e50ddc63597b186d23 Mon Sep 17 00:00:00 2001
From: Colin McCabe <cmccabe@apache.org>
Date: Thu, 11 Jul 2013 18:52:52 +0000
Subject: [PATCH] HADOOP-9186.  test-patch.sh should report build failure to
 JIRA.  (Binglin Chang via Colin Patrick McCabe)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1502325 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-support/test-patch.sh                     | 20 +++++++++++++++----
 .../hadoop-common/CHANGES.txt                 |  3 +++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index c4b2b8411b2..9bd4eb5820b 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -266,7 +266,7 @@ verifyPatch () {
 }
 
 ###############################################################################
-buildWithPatch () {
+prebuildWithoutPatch () {
   echo ""
   echo ""
   echo "======================================================================"
@@ -283,7 +283,10 @@ buildWithPatch () {
     $MVN clean test -DskipTests > $PATCH_DIR/trunkCompile.txt 2>&1
     if [[ $? != 0 ]] ; then
       echo "Top-level trunk compilation is broken?"
-      cleanupAndExit 1
+      JIRA_COMMENT="$JIRA_COMMENT
+
+    {color:red}-1 patch{color}.  Top-level trunk compilation may be broken."
+      return 1
     fi
     cd -
   fi
@@ -292,8 +295,12 @@ buildWithPatch () {
   $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Ptest-patch > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
   if [[ $? != 0 ]] ; then
     echo "Trunk compilation is broken?"
-    cleanupAndExit 1
+    JIRA_COMMENT="$JIRA_COMMENT
+
+    {color:red}-1 patch{color}.  Trunk compilation may be broken."
+    return 1
   fi
+  return 0
 }
 
 ###############################################################################
@@ -954,7 +961,12 @@ if [[ $RESULT != 0 ]] ; then
   submitJiraComment 1
   cleanupAndExit 1
 fi
-buildWithPatch
+prebuildWithoutPatch
+(( RESULT = RESULT + $? ))
+if [[ $RESULT != 0 ]] ; then
+  submitJiraComment 1
+  cleanupAndExit 1
+fi
 checkAuthor
 (( RESULT = RESULT + $? ))
 
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index a1e010de42e..abf0fe54117 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -302,6 +302,9 @@ Release 2.2.0 - UNRELEASED
     HADOOP-9417.  Support for symlink resolution in LocalFileSystem /
     RawLocalFileSystem.  (Andrew Wang via Colin Patrick McCabe)
 
+    HADOOP-9186.  test-patch.sh should report build failure to JIRA.
+    (Binglin Chang via Colin Patrick McCabe)
+
   OPTIMIZATIONS
 
   BUG FIXES