Return-Path: 
 <core-commits-return-8981-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 44249 invoked from network); 4 Jun 2009 09:29:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 4 Jun 2009 09:29:33 -0000
Received: (qmail 87071 invoked by uid 500); 4 Jun 2009 09:29:45 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 87004 invoked by uid 500); 4 Jun 2009 09:29:45 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 86995 invoked by uid 99); 4 Jun 2009 09:29:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2009 09:29:45 +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; Thu, 04 Jun 2009 09:29:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 00E602388877; Thu,  4 Jun 2009 09:29:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r781692 - in /hadoop/core/branches/HADOOP-4687/mapred:
 build.xml
 src/contrib/build-contrib.xml src/contrib/build.xml
 src/contrib/capacity-scheduler/ivy.xml
Date: Thu, 04 Jun 2009 09:29:18 -0000
To: core-commits@hadoop.apache.org
From: gkesavan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090604092920.00E602388877@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gkesavan
Date: Thu Jun  4 09:29:01 2009
New Revision: 781692

URL: http://svn.apache.org/viewvc?rev=781692&view=rev
Log:
HADOOP-4687. Fixes capacity scheduler test failures

Modified:
    hadoop/core/branches/HADOOP-4687/mapred/build.xml
    hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build-contrib.xml
    hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build.xml
    hadoop/core/branches/HADOOP-4687/mapred/src/contrib/capacity-scheduler/ivy.xml

Modified: hadoop/core/branches/HADOOP-4687/mapred/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/mapred/build.xml?rev=781692&r1=781691&r2=781692&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/mapred/build.xml (original)
+++ hadoop/core/branches/HADOOP-4687/mapred/build.xml Thu Jun  4 09:29:01 2009
@@ -586,7 +586,7 @@
     <fail unless="continueOnFailure">Tests failed!</fail>
   </target>
 
-  <target name="test-contrib" depends="compile" description="Run contrib unit tests">
+  <target name="test-contrib" depends="compile,compile-mapred-test" description="Run contrib unit tests">
     <subant target="test">
        <property name="version" value="${version}"/>
        <property name="clover.jar" value="${clover.jar}"/>

Modified: hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build-contrib.xml?rev=781692&r1=781691&r2=781692&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build-contrib.xml (original)
+++ hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build-contrib.xml Thu Jun  4 09:29:01 2009
@@ -41,6 +41,7 @@
   <property name="test.junit.output.format" value="plain"/>
   <property name="test.output" value="no"/>
   <property name="test.timeout" value="900000"/>
+  <property name="build.contrib.dir" location="${hadoop.root}/build/contrib"/>
   <property name="build.dir" location="${hadoop.root}/build/contrib/${name}"/>
   <property name="build.classes" location="${build.dir}/classes"/>
   <property name="build.test" location="${build.dir}/test"/>
@@ -247,7 +248,12 @@
         <fileset dir="${src.test}" includes="**/${testcase}.java"/>
       </batchtest>
     </junit>
-    <fail if="tests.failed">Tests failed!</fail>
+    <antcall target="checkfailure"/>
+  </target>
+
+  <target name="checkfailure" if="tests.failed">
+    <touch file="${build.contrib.dir}/testsfailed"/>
+    <fail unless="continueOnFailure">Contrib Tests failed!</fail>
   </target>
 
   <!-- ================================================================== -->

Modified: hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build.xml?rev=781692&r1=781691&r2=781692&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build.xml (original)
+++ hadoop/core/branches/HADOOP-4687/mapred/src/contrib/build.xml Thu Jun  4 09:29:01 2009
@@ -45,16 +45,20 @@
   <!-- Test all the contribs.                               -->
   <!-- ====================================================== -->
   <target name="test">
+      <property name="hadoop.root" location="${root}/../../../"/>
+      <property name="build.contrib.dir" location="${hadoop.root}/build/contrib"/>
+      <delete file="${build.contrib.dir}/testsfailed"/>
     <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"/>
+      <property name="continueOnFailure" value="true"/>
+      <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"/> 
     </subant>
+    <available file="${build.contrib.dir}/testsfailed" property="testsfailed"/>
+    <fail if="testsfailed">Tests failed!</fail>
   </target>
-  
-  
+
   <!-- ====================================================== -->
   <!-- Clean all the contribs.                              -->
   <!-- ====================================================== -->

Modified: hadoop/core/branches/HADOOP-4687/mapred/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/mapred/src/contrib/capacity-scheduler/ivy.xml?rev=781692&r1=781691&r2=781692&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/mapred/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/core/branches/HADOOP-4687/mapred/src/contrib/capacity-scheduler/ivy.xml Thu Jun  4 09:29:01 2009
@@ -24,6 +24,10 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
+   <dependency org="commons-cli"
+      name="commons-cli"
+      rev="${commons-cli.version}"
+      conf="common->default"/>
     <dependency org="commons-logging"
       name="commons-logging"
       rev="${commons-logging.version}"