From 1a066944ba2b6ceeb04c103a788a0a4c40784959 Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Tue, 25 Sep 2012 14:22:17 +0000 Subject: [PATCH] HADOOP-8838. Colorize the test-patch output sent to JIRA (Harsh J via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389875 13f79535-47bb-0310-9956-ffa450edef68 --- dev-support/test-patch.sh | 32 +++++++++---------- .../hadoop-common/CHANGES.txt | 3 ++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 5e389741425..6ce3dc32f41 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -250,7 +250,7 @@ verifyPatch () { echo "PATCH APPLICATION FAILED" JIRA_COMMENT="$JIRA_COMMENT - -1 patch. The patch command could not apply the patch." + {color:red}-1 patch{color}. The patch command could not apply the patch." return 1 else return 0 @@ -305,12 +305,12 @@ checkAuthor () { if [[ $authorTags != 0 ]] ; then JIRA_COMMENT="$JIRA_COMMENT - -1 @author. The patch appears to contain $authorTags @author tags which the Hadoop community has agreed to not allow in code contributions." + {color:red}-1 @author{color}. The patch appears to contain $authorTags @author tags which the Hadoop community has agreed to not allow in code contributions." return 1 fi JIRA_COMMENT="$JIRA_COMMENT - +1 @author. The patch does not contain any @author tags." + {color:green}+1 @author{color}. The patch does not contain any @author tags." return 0 } @@ -379,7 +379,7 @@ applyPatch () { echo "PATCH APPLICATION FAILED" JIRA_COMMENT="$JIRA_COMMENT - -1 patch. The patch command could not apply the patch." + {color:red}-1 patch{color}. The patch command could not apply the patch." return 1 fi return 0 @@ -416,12 +416,12 @@ checkJavadocWarnings () { if [[ $javadocWarnings -ne $OK_JAVADOC_WARNINGS ]] ; then JIRA_COMMENT="$JIRA_COMMENT - -1 javadoc. The javadoc tool appears to have generated `expr $(($javadocWarnings-$OK_JAVADOC_WARNINGS))` warning messages." + {color:red}-1 javadoc{color}. The javadoc tool appears to have generated `expr $(($javadocWarnings-$OK_JAVADOC_WARNINGS))` warning messages." return 1 fi JIRA_COMMENT="$JIRA_COMMENT - +1 javadoc. The javadoc tool did not generate any warning messages." + {color:green}+1 javadoc{color}. The javadoc tool did not generate any warning messages." return 0 } @@ -442,7 +442,7 @@ checkJavacWarnings () { if [[ $? != 0 ]] ; then JIRA_COMMENT="$JIRA_COMMENT - -1 javac. The patch appears to cause the build to fail." + {color:red}-1 javac{color:red}. The patch appears to cause the build to fail." return 2 fi ### Compare trunk and patch javac warning numbers @@ -456,7 +456,7 @@ checkJavacWarnings () { if [[ $patchJavacWarnings -gt $trunkJavacWarnings ]] ; then JIRA_COMMENT="$JIRA_COMMENT - -1 javac. The applied patch generated $patchJavacWarnings javac compiler warnings (more than the trunk's current $trunkJavacWarnings warnings)." + {color:red}-1 javac{color}. The applied patch generated $patchJavacWarnings javac compiler warnings (more than the trunk's current $trunkJavacWarnings warnings)." $DIFF $PATCH_DIR/filteredTrunkJavacWarnings.txt $PATCH_DIR/filteredPatchJavacWarnings.txt > $PATCH_DIR/diffJavacWarnings.txt JIRA_COMMENT_FOOTER="Javac warnings: $BUILD_URL/artifact/trunk/patchprocess/diffJavacWarnings.txt @@ -468,7 +468,7 @@ $JIRA_COMMENT_FOOTER" fi JIRA_COMMENT="$JIRA_COMMENT - +1 javac. The applied patch does not increase the total number of javac compiler warnings." + {color:green}+1 javac{color}. The applied patch does not increase the total number of javac compiler warnings." return 0 } @@ -538,12 +538,12 @@ $JIRA_COMMENT_FOOTER" # if [[ $patchStyleErrors != 0 ]] ; then # JIRA_COMMENT="$JIRA_COMMENT # -# -1 checkstyle. The patch generated $patchStyleErrors code style errors." +# {color:red}-1 checkstyle{color}. The patch generated $patchStyleErrors code style errors." # return 1 # fi # JIRA_COMMENT="$JIRA_COMMENT # -# +1 checkstyle. The patch generated 0 code style errors." +# {color:green}+1 checkstyle{color}. The patch generated 0 code style errors." return 0 } @@ -595,7 +595,7 @@ checkFindbugsWarnings () { if [ $rc != 0 ] ; then JIRA_COMMENT="$JIRA_COMMENT - -1 findbugs. The patch appears to cause Findbugs (version ${findbugs_version}) to fail." + {color:red}-1 findbugs{color}. The patch appears to cause Findbugs (version ${findbugs_version}) to fail." return 1 fi @@ -628,12 +628,12 @@ $JIRA_COMMENT_FOOTER" if [[ $findbugsWarnings -gt 0 ]] ; then JIRA_COMMENT="$JIRA_COMMENT - -1 findbugs. The patch appears to introduce $findbugsWarnings new Findbugs (version ${findbugs_version}) warnings." + {color:red}-1 findbugs{color}. The patch appears to introduce $findbugsWarnings new Findbugs (version ${findbugs_version}) warnings." return 1 fi JIRA_COMMENT="$JIRA_COMMENT - +1 findbugs. The patch does not introduce any new Findbugs (version ${findbugs_version}) warnings." + {color:green}+1 findbugs{color}. The patch does not introduce any new Findbugs (version ${findbugs_version}) warnings." return 0 } @@ -832,11 +832,11 @@ submitJiraComment () { JIRA_COMMENT_FOOTER="" fi if [[ $result == 0 ]] ; then - comment="+1 overall. $JIRA_COMMENT + comment="{color:green}+1 overall{color}. $JIRA_COMMENT $JIRA_COMMENT_FOOTER" else - comment="-1 overall. $JIRA_COMMENT + comment="{color:red}-1 overall{color}. $JIRA_COMMENT $JIRA_COMMENT_FOOTER" fi diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 5b4066b80f2..03649a9126a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -111,6 +111,9 @@ Trunk (Unreleased) HADOOP-7930. Kerberos relogin interval in UserGroupInformation should be configurable (Robert Kanter via harsh) + HADOOP-8838. Colorize the test-patch output sent to JIRA (Harsh J via + bobby) + BUG FIXES HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName.