Author: szetszwo
Date: Fri May 11 02:05:31 2012
New Revision: 1337003
URL: http://svn.apache.org/viewvc?rev=1337003&view=rev
Log:
Merge r1335791 through r1337002 from trunk.
Modified:
hadoop/common/branches/HDFS-3092/ (props changed)
hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh
Propchange: hadoop/common/branches/HDFS-3092/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1335791-1337002
Modified: hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh?rev=1337003&r1=1337002&r2=1337003&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh Fri May 11
02:05:31 2012
@@ -423,8 +423,8 @@ checkJavacWarnings () {
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
- -1 javac. The patch appears to cause tar ant target to fail."
- return 1
+ -1 javac. The patch appears to cause the build to fail."
+ return 2
fi
### Compare trunk and patch javac warning numbers
if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
@@ -529,6 +529,24 @@ $JIRA_COMMENT_FOOTER"
}
###############################################################################
+### Install the new jars so tests and findbugs can find all of the updated
jars
+buildAndInstall () {
+ echo ""
+ echo ""
+ echo "======================================================================"
+ echo "======================================================================"
+ echo " Installing all of the jars"
+ echo "======================================================================"
+ echo "======================================================================"
+ echo ""
+ echo ""
+ echo "$MVN install -Dmaven.javadoc.skip=true -DskipTests
-D${PROJECT_NAME}PatchProcess"
+ $MVN install -Dmaven.javadoc.skip=true -DskipTests
-D${PROJECT_NAME}PatchProcess
+ return $?
+}
+
+
+###############################################################################
### Check there are no changes in the number of Findbugs warnings
checkFindbugsWarnings () {
findbugs_version=`${FINDBUGS_HOME}/bin/findbugs -version`
@@ -882,15 +900,22 @@ if [[ $? != 0 ]] ; then
submitJiraComment 1
cleanupAndExit 1
fi
-checkJavadocWarnings
-(( RESULT = RESULT + $? ))
checkJavacWarnings
+JAVAC_RET=$?
+#2 is returned if the code could not compile
+if [[ $JAVAC_RET == 2 ]] ; then
+ submitJiraComment 1
+ cleanupAndExit 1
+fi
+(( RESULT = RESULT + $JAVAC_RET ))
+checkJavadocWarnings
(( RESULT = RESULT + $? ))
checkEclipseGeneration
(( RESULT = RESULT + $? ))
### Checkstyle not implemented yet
#checkStyle
#(( RESULT = RESULT + $? ))
+buildAndInstall
checkFindbugsWarnings
(( RESULT = RESULT + $? ))
checkReleaseAuditWarnings
