Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F5E948A9 for ; Fri, 13 May 2011 22:52:31 +0000 (UTC) Received: (qmail 22915 invoked by uid 500); 13 May 2011 22:52:31 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 22866 invoked by uid 500); 13 May 2011 22:52:31 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 22859 invoked by uid 99); 13 May 2011 22:52:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 May 2011 22:52:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 May 2011 22:52:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DD970238897F; Fri, 13 May 2011 22:52:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1102916 - in /hadoop/common/branches/branch-0.22: ./ CHANGES.txt build.xml src/docs/ src/java/ src/test/bin/test-patch.sh src/test/core/ src/test/core/org/apache/hadoop/io/TestSequenceFile.java Date: Fri, 13 May 2011 22:52:09 -0000 To: common-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110513225209.DD970238897F@eris.apache.org> Author: eli Date: Fri May 13 22:52:09 2011 New Revision: 1102916 URL: http://svn.apache.org/viewvc?rev=1102916&view=rev Log: HADOOP-7291. svn merge -c 1102914 from trunk Modified: hadoop/common/branches/branch-0.22/ (props changed) hadoop/common/branches/branch-0.22/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.22/build.xml hadoop/common/branches/branch-0.22/src/docs/ (props changed) hadoop/common/branches/branch-0.22/src/java/ (props changed) hadoop/common/branches/branch-0.22/src/test/bin/test-patch.sh hadoop/common/branches/branch-0.22/src/test/core/ (props changed) hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java (props changed) Propchange: hadoop/common/branches/branch-0.22/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 13 22:52:09 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056 +/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914 /hadoop/core/branches/branch-0.19/core:713112 Modified: hadoop/common/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1102916&r1=1102915&r2=1102916&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/CHANGES.txt Fri May 13 22:52:09 2011 @@ -464,6 +464,8 @@ Release 0.22.0 - Unreleased HADOOP-7068. Ivy resolve force mode should be turned off by default. (Luke Lu via tomwhite) + HADOOP-7291. Update Hudson job not to run test-contrib. (nigel via eli) + Release 0.21.1 - Unreleased IMPROVEMENTS Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 13 22:52:09 2011 @@ -1,4 +1,4 @@ -/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056 +/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278 Modified: hadoop/common/branches/branch-0.22/build.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/build.xml?rev=1102916&r1=1102915&r2=1102916&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/build.xml (original) +++ hadoop/common/branches/branch-0.22/build.xml Fri May 13 22:52:09 2011 @@ -1497,7 +1497,6 @@ - Propchange: hadoop/common/branches/branch-0.22/src/docs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 13 22:52:09 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056 +/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914 /hadoop/core/branches/branch-0.19/src/docs:713112 Propchange: hadoop/common/branches/branch-0.22/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 13 22:52:09 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056 +/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914 /hadoop/core/branches/branch-0.19/core/src/java:713112 /hadoop/core/trunk/src/core:776175-785643,785929-786278 Modified: hadoop/common/branches/branch-0.22/src/test/bin/test-patch.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/test/bin/test-patch.sh?rev=1102916&r1=1102915&r2=1102916&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/src/test/bin/test-patch.sh (original) +++ hadoop/common/branches/branch-0.22/src/test/bin/test-patch.sh Fri May 13 22:52:09 2011 @@ -26,8 +26,8 @@ parseArgs() { HUDSON) ### Set HUDSON to true to indicate that this script is being run by Hudson HUDSON=true - if [[ $# != 17 ]] ; then - echo "ERROR: usage $0 HUDSON " + if [[ $# != 16 ]] ; then + echo "ERROR: usage $0 HUDSON " cleanupAndExit 0 fi PATCH_DIR=$2 @@ -41,11 +41,10 @@ parseArgs() { FINDBUGS_HOME=${10} FORREST_HOME=${11} ECLIPSE_HOME=${12} - PYTHON_HOME=${13} - BASEDIR=${14} - JIRA_PASSWD=${15} - CURL=${16} - defect=${17} + BASEDIR=${13} + JIRA_PASSWD=${14} + CURL=${15} + defect=${16} ### Retrieve the defect number if [ -z "$defect" ] ; then @@ -58,7 +57,6 @@ parseArgs() { fi ECLIPSE_PROPERTY="-Declipse.home=$ECLIPSE_HOME" - PYTHON_PROPERTY="-Dpython.home=$PYTHON_HOME" ;; DEVELOPER) ### Set HUDSON to false to indicate that this script is being run by a developer @@ -522,11 +520,16 @@ runContribTests () { echo "" echo "" + if [[ `$GREP -c 'test-contrib' build.xml` == 0 ]] ; then + echo "No contrib tests in this project." + return 0 + fi + ### Kill any rogue build processes from the last attempt $PS -auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null - echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib" - $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib + echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib" + $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib if [[ $? != 0 ]] ; then JIRA_COMMENT="$JIRA_COMMENT @@ -635,6 +638,8 @@ cleanupAndExit () { ############################################################################### ############################################################################### +runContribTests + JIRA_COMMENT="" JIRA_COMMENT_FOOTER="Console output: $BUILD_URL/console Propchange: hadoop/common/branches/branch-0.22/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 13 22:52:09 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056 +/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278 Propchange: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 13 22:52:09 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056 +/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643