hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkesa...@apache.org
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 GMT
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}"



Mime
View raw message