Return-Path: 
 <common-commits-return-10375-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: (qmail 59045 invoked from network); 13 Jan 2010 13:14:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 13 Jan 2010 13:14:51 -0000
Received: (qmail 13899 invoked by uid 500); 13 Jan 2010 13:14:51 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 13845 invoked by uid 500); 13 Jan 2010 13:14:51 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 13836 invoked by uid 99); 13 Jan 2010 13:14:51 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jan 2010 13:14:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 13 Jan 2010 13:14:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 71D1A23888CF; Wed, 13 Jan 2010 13:14:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r898736 - in /hadoop/common/trunk: CHANGES.txt build.xml
 src/contrib/build.xml
Date: Wed, 13 Jan 2010 13:14:30 -0000
To: common-commits@hadoop.apache.org
From: cdouglas@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100113131430.71D1A23888CF@eris.apache.org>

Author: cdouglas
Date: Wed Jan 13 13:14:29 2010
New Revision: 898736

URL: http://svn.apache.org/viewvc?rev=898736&view=rev
Log:
HADOOP-6451. Fix build to run contrib unit tests. Contributed by Tom White

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/build.xml
    hadoop/common/trunk/src/contrib/build.xml

Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=898736&r1=898735&r2=898736&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Wed Jan 13 13:14:29 2010
@@ -1270,6 +1270,8 @@
     HADOOP-6441. Protect web ui from cross site scripting attacks (XSS) on
     the host http header and using encoded utf-7. (omalley)
 
+    HADOOP-6451. Fix build to run contrib unit tests. (Tom White via cdouglas)
+
 Release 0.20.2 - Unreleased
 
   NEW FEATURES

Modified: hadoop/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=898736&r1=898735&r2=898736&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Wed Jan 13 13:14:29 2010
@@ -375,7 +375,7 @@
   </target>
 
   <target name="compile-contrib" depends="compile-core">
-     <subant target="compile" inheritall="true">
+     <subant target="compile">
         <property name="version" value="${version}"/>
         <fileset file="${contrib.dir}/build.xml"/>
      </subant>  	
@@ -661,7 +661,7 @@
   </target>
 
   <target name="test-contrib" depends="compile, compile-core-test" description="Run contrib unit tests">
-    <subant target="test" inheritall="true">
+    <subant target="test">
        <property name="version" value="${version}"/>
        <property name="clover.jar" value="${clover.jar}"/>
        <fileset file="${contrib.dir}/build.xml"/>
@@ -678,7 +678,7 @@
   </target>
 
   <target name="test" depends="jar-test,test-core" description="Run all unit tests">
-    <subant target="test-contrib" inheritall="true">	 
+    <subant target="test-contrib">	 
       <fileset dir="." includes="build.xml"/>
     </subant>
   </target>
@@ -973,7 +973,7 @@
 	  <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
     </exec>
 
-    <subant target="package" inheritall="true">
+    <subant target="package">
       <!--Pass down the version in case its needed again and the target
       distribution directory so contribs know where to install to.-->
       <property name="version" value="${version}"/>
@@ -1073,7 +1073,7 @@
 	  <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
     </exec>
 
-    <subant target="package" inheritall="true">
+    <subant target="package">
       <!--Pass down the version in case its needed again and the target
       distribution directory so contribs know where to install to.-->
       <property name="version" value="${version}"/>
@@ -1227,7 +1227,7 @@
   <!-- Using subant instead of ant as a workaround for 30569              -->
   <!-- ================================================================== -->
   <target name="clean-contrib">
-     <subant target="clean" inheritall="true">        
+     <subant target="clean">        
         <fileset file="src/contrib/build.xml"/>
      </subant>  	
   </target>

Modified: hadoop/common/trunk/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/contrib/build.xml?rev=898736&r1=898735&r2=898736&view=diff
==============================================================================
--- hadoop/common/trunk/src/contrib/build.xml (original)
+++ hadoop/common/trunk/src/contrib/build.xml Wed Jan 13 13:14:29 2010
@@ -46,11 +46,8 @@
   <!-- ====================================================== -->
   <target name="test">
     <subant target="test">
-      <fileset dir="." includes="hdfsproxy/build.xml"/>
-      <fileset dir="." includes="streaming/build.xml"/>
-      <fileset dir="." includes="fairscheduler/build.xml"/>
-      <fileset dir="." includes="capacity-scheduler/build.xml"/>
-      <fileset dir="." includes="mrunit/build.xml"/>
+      <fileset dir="." includes="failmon/build.xml"/>
+      <fileset dir="." includes="hod/build.xml"/>
     </subant>
   </target>