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 A6AF0D948 for ; Mon, 22 Oct 2012 20:44:10 +0000 (UTC) Received: (qmail 71342 invoked by uid 500); 22 Oct 2012 20:44:10 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 71291 invoked by uid 500); 22 Oct 2012 20:44:10 -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 71284 invoked by uid 99); 22 Oct 2012 20:44:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2012 20:44:10 +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; Mon, 22 Oct 2012 20:44:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2D72E2388A4A for ; Mon, 22 Oct 2012 20:43:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1401071 - in /hadoop/common/branches/branch-trunk-win: ./ .gitattributes dev-support/ dev-support/test-patch.sh hadoop-project/pom.xml hadoop-tools/ hadoop-tools/hadoop-pipes/ pom.xml Date: Mon, 22 Oct 2012 20:43:24 -0000 To: common-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121022204325.2D72E2388A4A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: suresh Date: Mon Oct 22 20:43:16 2012 New Revision: 1401071 URL: http://svn.apache.org/viewvc?rev=1401071&view=rev Log: Merging trunk changes to branch-trunk-win. Added: hadoop/common/branches/branch-trunk-win/.gitattributes - copied unchanged from r1401062, hadoop/common/trunk/.gitattributes Modified: hadoop/common/branches/branch-trunk-win/ (props changed) hadoop/common/branches/branch-trunk-win/dev-support/ (props changed) hadoop/common/branches/branch-trunk-win/dev-support/test-patch.sh hadoop/common/branches/branch-trunk-win/hadoop-project/pom.xml hadoop/common/branches/branch-trunk-win/hadoop-tools/ (props changed) hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-pipes/ (props changed) hadoop/common/branches/branch-trunk-win/pom.xml Propchange: hadoop/common/branches/branch-trunk-win/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1397381-1401062 Propchange: hadoop/common/branches/branch-trunk-win/dev-support/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Oct 22 20:43:16 2012 @@ -0,0 +1,4 @@ +target +.classpath +.project +.settings Modified: hadoop/common/branches/branch-trunk-win/dev-support/test-patch.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/dev-support/test-patch.sh?rev=1401071&r1=1401070&r2=1401071&view=diff ============================================================================== --- hadoop/common/branches/branch-trunk-win/dev-support/test-patch.sh (original) +++ hadoop/common/branches/branch-trunk-win/dev-support/test-patch.sh Mon Oct 22 20:43:16 2012 @@ -32,7 +32,7 @@ JENKINS=false PATCH_DIR=/tmp SUPPORT_DIR=/tmp BASEDIR=$(pwd) - +BUILD_NATIVE=true PS=${PS:-ps} AWK=${AWK:-awk} WGET=${WGET:-wget} @@ -67,6 +67,7 @@ printUsage() { echo "--forrest-home= Forrest home directory (default FORREST_HOME environment variable)" echo "--dirty-workspace Allow the local SVN workspace to have uncommitted changes" echo "--run-tests Run all tests below the base directory" + echo "--build-native= If true, then build native components (default 'true')" echo echo "Jenkins-only options:" echo "--jenkins Run by Jenkins (runs tests and posts results to JIRA)" @@ -139,11 +140,18 @@ parseArgs() { --run-tests) RUN_TESTS=true ;; + --build-native=*) + BUILD_NATIVE=${i#*=} + ;; *) PATCH_OR_DEFECT=$i ;; esac done + if [[ $BUILD_NATIVE == "true" ]] ; then + NATIVE_PROFILE=-Pnative + REQUIRE_TEST_LIB_HADOOP=-Drequire.test.libhadoop + fi if [ -z "$PATCH_OR_DEFECT" ]; then printUsage exit 1 @@ -437,8 +445,8 @@ checkJavacWarnings () { echo "======================================================================" echo "" echo "" - echo "$MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Pnative -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1" - $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Pnative -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1 + echo "$MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess $NATIVE_PROFILE -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1" + $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess $NATIVE_PROFILE -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1 if [[ $? != 0 ]] ; then JIRA_COMMENT="$JIRA_COMMENT @@ -707,8 +715,8 @@ runTests () { if [[ $building_common -eq 0 ]]; then echo " Building hadoop-common with -Pnative in order to provide \ libhadoop.so to the hadoop-hdfs unit tests." - echo " $MVN compile -Pnative -D${PROJECT_NAME}PatchProcess" - if ! $MVN compile -Pnative -D${PROJECT_NAME}PatchProcess; then + echo " $MVN compile $NATIVE_PROFILE -D${PROJECT_NAME}PatchProcess" + if ! $MVN compile $NATIVE_PROFILE -D${PROJECT_NAME}PatchProcess; then JIRA_COMMENT="$JIRA_COMMENT {color:red}-1 core tests{color}. Failed to build the native portion \ of hadoop-common prior to running the unit tests in $ordered_modules" @@ -719,8 +727,8 @@ of hadoop-common prior to running the un for module in $ordered_modules; do cd $module echo " Running tests in $module" - echo " $MVN clean install -fn -Pnative -D${PROJECT_NAME}PatchProcess" - $MVN clean install -fn -Pnative -Drequire.test.libhadoop -D${PROJECT_NAME}PatchProcess + echo " $MVN clean install -fn $NATIVE_PROFILE $REQUIRE_TEST_LIB_HADOOP -D${PROJECT_NAME}PatchProcess" + $MVN clean install -fn $NATIVE_PROFILE $REQUIRE_TEST_LIB_HADOOP -D${PROJECT_NAME}PatchProcess module_failed_tests=`find . -name 'TEST*.xml' | xargs $GREP -l -E " $TMP + $GREP '^+++ \|^--- ' $PATCH_DIR/patch | cut -c '5-' | $GREP -v /dev/null | sort | uniq > $TMP # if all of the lines start with a/ or b/, then this is a git patch that # was generated without --no-prefix Modified: hadoop/common/branches/branch-trunk-win/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-project/pom.xml?rev=1401071&r1=1401070&r2=1401071&view=diff ============================================================================== --- hadoop/common/branches/branch-trunk-win/hadoop-project/pom.xml (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-project/pom.xml Mon Oct 22 20:43:16 2012 @@ -656,12 +656,6 @@ compile - com.cenqua.clover - clover - - 3.0.2 - - org.hsqldb hsqldb 2.0.0 @@ -731,11 +725,6 @@ 2.3.2 - com.atlassian.maven.plugins - maven-clover2-plugin - 3.0.5 - - org.apache.maven.plugins maven-checkstyle-plugin 2.6 @@ -911,54 +900,6 @@ Mac_OS_X-${sun.arch.data.model} - - - clover - - false - - clover - - - - ${user.home}/.clover.license - ${project.build.directory}/clover/hadoop-coverage.db - - - - - com.atlassian.maven.plugins - maven-clover2-plugin - - true - true - ${cloverLicenseLocation} - ${cloverDatabase} - 50% - ${project.build.directory}/clover - true - true - - - - clover-setup - process-sources - - setup - - - - clover - test - - clover - - - - - - - test-patch Propchange: hadoop/common/branches/branch-trunk-win/hadoop-tools/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 22 20:43:16 2012 @@ -1 +1,4 @@ target +.classpath +.project +.settings Propchange: hadoop/common/branches/branch-trunk-win/hadoop-tools/hadoop-pipes/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 22 20:43:16 2012 @@ -1 +1,4 @@ target +.classpath +.project +.settings Modified: hadoop/common/branches/branch-trunk-win/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/pom.xml?rev=1401071&r1=1401070&r2=1401071&view=diff ============================================================================== --- hadoop/common/branches/branch-trunk-win/pom.xml (original) +++ hadoop/common/branches/branch-trunk-win/pom.xml Mon Oct 22 20:43:16 2012 @@ -23,6 +23,17 @@ xsi:schemaLocation="http://maven.apache. Apache Hadoop Main pom + + + + com.cenqua.clover + clover + + 3.0.2 + + + + apache.staging.https @@ -243,6 +254,11 @@ xsi:schemaLocation="http://maven.apache. + + com.atlassian.maven.plugins + maven-clover2-plugin + 3.0.5 + @@ -483,6 +499,52 @@ xsi:schemaLocation="http://maven.apache. - + + clover + + false + + clover + + + + ${user.home}/.clover.license + ${project.build.directory}/clover/hadoop-coverage.db + + + + + com.atlassian.maven.plugins + maven-clover2-plugin + + true + true + ${cloverLicenseLocation} + ${cloverDatabase} + 50% + ${project.build.directory}/clover + true + true + + + + clover-setup + process-sources + + setup + + + + clover + test + + clover + + + + + + +