瀏覽代碼

ZOOKEEPER-926. Fork Hadoop common's test-patch.sh and modify for Zookeeper. Update allowed number of warnings.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@1033155 13f79535-47bb-0310-9956-ffa450edef68
Nigel Daley 14 年之前
父節點
當前提交
ae60742321
共有 2 個文件被更改,包括 2 次插入34 次删除
  1. 2 2
      src/java/test/bin/test-patch.properties
  2. 0 32
      src/java/test/bin/test-patch.sh

+ 2 - 2
src/java/test/bin/test-patch.properties

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OK_RELEASEAUDIT_WARNINGS=0
-OK_FINDBUGS_WARNINGS=0
+OK_RELEASEAUDIT_WARNINGS=24
+OK_FINDBUGS_WARNINGS=1
 OK_JAVADOC_WARNINGS=0

+ 0 - 32
src/java/test/bin/test-patch.sh

@@ -518,36 +518,6 @@ runContribTests () {
   return 0
 }
 
-###############################################################################
-### Run the inject-system-faults target
-checkInjectSystemFaults () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Checking the integrity of system test framework code."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  
-  ### Kill any rogue build processes from the last attempt
-  $PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
-
-  echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults"
-  $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME inject-system-faults
-  if [[ $? != 0 ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 system test framework.  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."
-  return 0
-}
-
 ###############################################################################
 ### Submit a comment to the defect's Jira
 submitJiraComment () {
@@ -659,8 +629,6 @@ if [[ $HUDSON == "true" ]] ; then
   runContribTests
   (( RESULT = RESULT + $? ))
 fi
-checkInjectSystemFaults
-(( RESULT = RESULT + $? ))
 JIRA_COMMENT_FOOTER="Test results: $BUILD_URL/testReport/
 $JIRA_COMMENT_FOOTER"