Browse Source

commit c026f8e1fc4a322636565feab22ba7e44d2e35c1
Author: Hemanth Yamijala <yhemanth@yahoo-inc.com>
Date: Fri Jan 22 16:23:34 2010 +0530

HADOOP:5457 from https://issues.apache.org/jira/secure/attachment/12431103/Hadoop-5457-y20.patch

+++ b/YAHOO-CHANGES.txt
+ HADOOP-5457. Fix to continue to run builds even if contrib test fails.
+ (gkesavan)
+


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077118 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley 14 năm trước cách đây
mục cha
commit
e682871c83
2 tập tin đã thay đổi với 13 bổ sung1 xóa
  1. 7 1
      src/contrib/build-contrib.xml
  2. 6 0
      src/contrib/build.xml

+ 7 - 1
src/contrib/build-contrib.xml

@@ -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"/>
@@ -245,7 +246,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>
 
   <!-- ================================================================== -->

+ 6 - 0
src/contrib/build.xml

@@ -45,13 +45,19 @@
   <!-- 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">
+      <property name="continueOnFailure" value="true"/>
       <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="gridmix/build.xml"/>
     </subant>
+     <available file="${build.contrib.dir}/testsfailed" property="testsfailed"/>
+     <fail if="testsfailed">Tests failed!</fail>
   </target>