浏览代码

HADOOP-5088. Include releaseaudit target as part of developer test-patch target. Contributed by Giridharan Kesavan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@739187 13f79535-47bb-0310-9956-ffa450edef68
Nigel Daley 16 年之前
父节点
当前提交
4963d54586
共有 2 个文件被更改,包括 10 次插入14 次删除
  1. 4 1
      CHANGES.txt
  2. 6 13
      src/test/bin/test-patch.sh

+ 4 - 1
CHANGES.txt

@@ -45,7 +45,10 @@ Trunk (unreleased changes)
     HADOOP-5070. Increment copyright year to 2009, remove assertions of ASF
     HADOOP-5070. Increment copyright year to 2009, remove assertions of ASF
     copyright to licensed files. (Tsz Wo (Nicholas), SZE via cdouglas)
     copyright to licensed files. (Tsz Wo (Nicholas), SZE via cdouglas)
 
 
-    HADOOP-5037  Deprecate static FSNamesystem.getFSNamesystem().  (szetszwo)
+    HADOOP-5037. Deprecate static FSNamesystem.getFSNamesystem().  (szetszwo)
+
+    HADOOP-5088. Include releaseaudit target as part of developer test-patch
+    target.  (Giridharan Kesavan via nigel)
 
 
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 

+ 6 - 13
src/test/bin/test-patch.sh

@@ -158,12 +158,8 @@ setup () {
   echo "======================================================================"
   echo "======================================================================"
   echo ""
   echo ""
   echo ""
   echo ""
-  ### DISABLE RELEASE AUDIT UNTIL HADOOP-4074 IS FIXED
-  ### Do not call releaseaudit when run by a developer
-  ### if [[ $HUDSON == "true" ]] ; then
-    ### echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1"
-    ### $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1
-  ### fi
+  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1"
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1
   echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
   echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
   $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
   $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
   if [[ $? != 0 ]] ; then
   if [[ $? != 0 ]] ; then
@@ -342,8 +338,8 @@ checkReleaseAuditWarnings () {
   echo "======================================================================"
   echo "======================================================================"
   echo ""
   echo ""
   echo ""
   echo ""
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
+  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
 
 
   ### Compare trunk and patch release audit warning numbers
   ### Compare trunk and patch release audit warning numbers
   if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
   if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
@@ -675,11 +671,10 @@ checkFindbugsWarnings
 (( RESULT = RESULT + $? ))
 (( RESULT = RESULT + $? ))
 checkEclipse
 checkEclipse
 (( RESULT = RESULT + $? ))
 (( RESULT = RESULT + $? ))
+checkReleaseAuditWarnings
+(( RESULT = RESULT + $? ))
 ### Do not call these when run by a developer 
 ### Do not call these when run by a developer 
 if [[ $HUDSON == "true" ]] ; then
 if [[ $HUDSON == "true" ]] ; then
-  ### DISABLE RELEASE AUDIT UNTIL HADOOP-4074 IS FIXED
-  ### checkReleaseAuditWarnings
-  ### (( RESULT = RESULT + $? ))
   runCoreTests
   runCoreTests
   (( RESULT = RESULT + $? ))
   (( RESULT = RESULT + $? ))
   runContribTests
   runContribTests
@@ -690,5 +685,3 @@ $JIRA_COMMENT_FOOTER"
 
 
 submitJiraComment $RESULT
 submitJiraComment $RESULT
 cleanupAndExit $RESULT
 cleanupAndExit $RESULT
-
-