Author: todd
Date: Tue Sep 25 22:43:04 2012
New Revision: 1390199
URL: http://svn.apache.org/viewvc?rev=1390199&view=rev
Log:
Merge trunk into branch
Added:
hadoop/common/branches/HDFS-3077/dev-support/relnotes.py
- copied unchanged from r1390198,
hadoop/common/trunk/dev-support/relnotes.py
Modified:
hadoop/common/branches/HDFS-3077/ (props changed)
hadoop/common/branches/HDFS-3077/dev-support/test-patch.sh
Propchange: hadoop/common/branches/HDFS-3077/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1387449-1390198
Modified: hadoop/common/branches/HDFS-3077/dev-support/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/dev-support/test-patch.sh?rev=1390199&r1=1390198&r2=1390199&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-3077/dev-support/test-patch.sh Tue Sep 25
22:43:04 2012
@@ -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
}
@@ -341,14 +341,14 @@ checkTests () {
fi
JIRA_COMMENT="$JIRA_COMMENT
- -1 tests included. The patch doesn't appear to include any new or
modified tests.
+ {color:red}-1 tests included{color}. The patch doesn't appear to include
any new or modified tests.
Please justify why no new tests are needed for this
patch.
Also please list what manual steps were performed to
verify this patch."
return 1
fi
JIRA_COMMENT="$JIRA_COMMENT
- +1 tests included. The patch appears to include $testReferences new or
modified test files."
+ {color:green}+1 tests included{color}. The patch appears to include
$testReferences new or modified test files."
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
}
@@ -498,7 +498,7 @@ checkReleaseAuditWarnings () {
if [[ $patchReleaseAuditWarnings -gt 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
- -1 release audit. The applied patch generated $patchReleaseAuditWarnings
release audit warnings."
+ {color:red}-1 release audit{color}. The applied patch generated
$patchReleaseAuditWarnings release audit warnings."
$GREP '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt >
$PATCH_DIR/patchReleaseAuditProblems.txt
echo "Lines that start with ????? in the release audit report indicate
files that do not have an Apache license header." >>
$PATCH_DIR/patchReleaseAuditProblems.txt
JIRA_COMMENT_FOOTER="Release audit warnings:
$BUILD_URL/artifact/trunk/patchprocess/patchReleaseAuditProblems.txt
@@ -509,7 +509,7 @@ $JIRA_COMMENT_FOOTER"
fi
JIRA_COMMENT="$JIRA_COMMENT
- +1 release audit. The applied patch does not increase the total number of
release audit warnings."
+ {color:green}+1 release audit{color}. The applied patch does not increase
the total number of release audit 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
}
@@ -655,12 +655,12 @@ checkEclipseGeneration () {
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
- -1 eclipse:eclipse. The patch failed to build with eclipse:eclipse."
+ {color:red}-1 eclipse:eclipse{color}. The patch failed to build with
eclipse:eclipse."
return 1
fi
JIRA_COMMENT="$JIRA_COMMENT
- +1 eclipse:eclipse. The patch built with eclipse:eclipse."
+ {color:green}+1 eclipse:eclipse{color}. The patch built with
eclipse:eclipse."
return 0
}
@@ -700,13 +700,13 @@ ${module_failed_tests}"
if [[ -n "$failed_tests" ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
- -1 core tests. The patch failed these unit tests in $modules:
+ {color:red}-1 core tests{color}. The patch failed these unit tests in
$modules:
$failed_tests"
return 1
fi
JIRA_COMMENT="$JIRA_COMMENT
- +1 core tests. The patch passed unit tests in $modules."
+ {color:green}+1 core tests{color}. The patch passed unit tests in
$modules."
return 0
}
@@ -782,12 +782,12 @@ runContribTests () {
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
- -1 contrib tests. The patch failed contrib unit tests."
+ {color:red}-1 contrib tests{color}. The patch failed contrib unit tests."
return 1
fi
JIRA_COMMENT="$JIRA_COMMENT
- +1 contrib tests. The patch passed contrib unit tests."
+ {color:green}+1 contrib tests{color}. The patch passed contrib unit
tests."
return 0
}
@@ -814,12 +814,12 @@ checkInjectSystemFaults () {
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
- -1 system test framework. The patch failed system test framework compile."
+ {color:red}-1 system test framework{color}. The patch failed system test
framework compile."
return 1
fi
JIRA_COMMENT="$JIRA_COMMENT
- +1 system test framework. The patch passed system test framework compile."
+ {color:green}+1 system test framework{color}. The patch passed system
test framework compile."
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
