Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-7349 Jenkins build should compare trunk vs patch for Javadoc warnings; REVERT

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1423240 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-12-18 01:14:47 +00:00
parent 47775d321d
commit 8cff59858c
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev-support/test-patch.properties
View File

@ -20,3 +20,4 @@ MAVEN_OPTS="-Xmx3g"
OK_RELEASEAUDIT_WARNINGS=84 OK_RELEASEAUDIT_WARNINGS=84
OK_FINDBUGS_WARNINGS=517 OK_FINDBUGS_WARNINGS=517
OK_JAVADOC_WARNINGS=169

34
dev-support/test-patch.sh
View File

@ -225,17 +225,18 @@ setup () {
fi fi
. $BASEDIR/dev-support/test-patch.properties . $BASEDIR/dev-support/test-patch.properties
### exit if warnings are NOT defined in the properties file ### exit if warnings are NOT defined in the properties file
if [[ -z "$OK_FINDBUGS_WARNINGS" ]] || [[ -z "$OK_RELEASEAUDIT_WARNINGS" ]] ; then if [ -z "$OK_FINDBUGS_WARNINGS" ] || [[ -z "$OK_JAVADOC_WARNINGS" ]] || [[ -z $OK_RELEASEAUDIT_WARNINGS ]] ; then
echo "Please define the following properties in test-patch.properties file" echo "Please define the following properties in test-patch.properties file"
echo "OK_FINDBUGS_WARNINGS" echo "OK_FINDBUGS_WARNINGS"
echo "OK_RELEASEAUDIT_WARNINGS" echo "OK_RELEASEAUDIT_WARNINGS"
echo "OK_JAVADOC_WARNINGS"
cleanupAndExit 1 cleanupAndExit 1
fi fi
echo "" echo ""
echo "" echo ""
echo "======================================================================" echo "======================================================================"
echo "======================================================================" echo "======================================================================"
echo " Pre-build trunk to verify trunk stability and javac warnings." echo " Pre-build trunk to verify trunk stability and javac warnings"
echo "======================================================================" echo "======================================================================"
echo "======================================================================" echo "======================================================================"
echo "" echo ""
@ -249,21 +250,6 @@ setup () {
cleanupAndExit 1 cleanupAndExit 1
fi fi
echo ""
echo ""
echo "======================================================================"
echo "======================================================================"
echo " Pre-build trunk to determine number of trunk javadoc warnings."
echo "======================================================================"
echo "======================================================================"
echo ""
echo ""
echo "$MVN clean package javadoc:javadoc -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunkJavadocWarnings.txt 2>&1"
$MVN clean package javadoc:javadoc -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunkJavadocWarnings.txt 2>&1
trunkJavadocWarnings=`$GREP '\[WARNING\]' $PATCH_DIR/trunkJavadocWarnings.txt | $AWK '/Javadoc Warnings/,EOF' | $GREP warning | $AWK 'BEGIN {total = 0} {total += 1} END {print total}'`
echo ""
echo ""
echo "There appear to be $trunkJavadocWarnings javadoc warnings generated on trunk."
} }
############################################################################### ###############################################################################
@ -362,7 +348,7 @@ checkHadoop20Compile () {
echo "" echo ""
echo "======================================================================" echo "======================================================================"
echo "======================================================================" echo "======================================================================"
echo " Checking against hadoop 2.0 build." echo " Checking against hadoop 2.0 build"
echo "======================================================================" echo "======================================================================"
echo "======================================================================" echo "======================================================================"
echo "" echo ""
@ -399,21 +385,21 @@ checkJavadocWarnings () {
echo "$MVN clean package javadoc:javadoc -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchJavadocWarnings.txt 2>&1" echo "$MVN clean package javadoc:javadoc -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchJavadocWarnings.txt 2>&1"
export MAVEN_OPTS="${MAVEN_OPTS}" export MAVEN_OPTS="${MAVEN_OPTS}"
$MVN clean package javadoc:javadoc -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchJavadocWarnings.txt 2>&1 $MVN clean package javadoc:javadoc -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchJavadocWarnings.txt 2>&1
patchJavadocWarnings=`$GREP '\[WARNING\]' $PATCH_DIR/patchJavadocWarnings.txt | $AWK '/Javadoc Warnings/,EOF' | $GREP warning | $AWK 'BEGIN {total = 0} {total += 1} END {print total}'` javadocWarnings=`$GREP '\[WARNING\]' $PATCH_DIR/patchJavadocWarnings.txt | $AWK '/Javadoc Warnings/,EOF' | $GREP warning | $AWK 'BEGIN {total = 0} {total += 1} END {print total}'`
echo "" echo ""
echo "" echo ""
echo "There appear to be $patchJavadocWarnings javadoc warnings generated by the patched build." echo "There appear to be $javadocWarnings javadoc warnings generated by the patched build."
### if patch warnings greater than trunk warnings ### if current warnings greater than OK_JAVADOC_WARNINGS
if [[ $patchJavadocWarnings -gt $trunkJavadocWarnings ]] ; then if [[ $javadocWarnings -gt $OK_JAVADOC_WARNINGS ]] ; then
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT
{color:red}-1 javadoc{color}. The javadoc tool generates `expr $(($patchJavadocWarnings-$trunkJavadocWarnings))` additional warning messages with this patch." {color:red}-1 javadoc{color}. The javadoc tool appears to have generated `expr $(($javadocWarnings-$OK_JAVADOC_WARNINGS))` warning messages."
return 1 return 1
fi fi
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT
{color:green}+1 javadoc{color}. The javadoc tool did not generate any additional warning messages." {color:green}+1 javadoc{color}. The javadoc tool did not generate any warning messages."
return 0 return 0
} }