Index: dev-support/test-patch.sh =================================================================== --- dev-support/test-patch.sh (revision 1549716) +++ dev-support/test-patch.sh (working copy) @@ -344,7 +344,7 @@ ############################################################################### ### Attempt to compile against the hadoop 1.1 -checkHadoop20Compile () { +checkHadoop11Compile () { echo "" echo "" echo "======================================================================" @@ -376,39 +376,7 @@ return 0 } -############################################################################### -### Attempt to compile against the hadoop 1.0 -checkHadoop10Compile () { - echo "" - echo "" - echo "======================================================================" - echo "======================================================================" - echo " Checking against hadoop 1.0 build" - echo "======================================================================" - echo "======================================================================" - echo "" - echo "" - export MAVEN_OPTS="${MAVEN_OPTS}" - # build core and tests - $MVN clean test help:active-profiles -X -DskipTests -Dhadoop.profile=1.0 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk1.0JavacWarnings.txt 2>&1 - if [[ $? != 0 ]] ; then - ERR=`$GREP -A 5 'Compilation failure' $PATCH_DIR/trunk1.0JavacWarnings.txt` - JIRA_COMMENT="$JIRA_COMMENT - - {color:red}-1 hadoop1.0{color}. The patch failed to compile against the hadoop 1.0 profile. - Here is snippet of errors: - {code}$ERR{code}" - submitJiraComment 1 - cleanupAndExit 1 - fi - JIRA_COMMENT="$JIRA_COMMENT - - {color:green}+1 hadoop1.0{color}. The patch compiles against the hadoop 1.0 profile." - return 0 -} - - ############################################################################### ### Check against known anti-patterns checkAntiPatterns () { @@ -897,10 +865,8 @@ checkAntiPatterns (( RESULT = RESULT + $? )) -checkHadoop10Compile +checkHadoop11Compile (( RESULT = RESULT + $? )) -checkHadoop20Compile -(( RESULT = RESULT + $? )) checkJavadocWarnings (( RESULT = RESULT + $? )) checkJavacWarnings