Author: gkesavan
Date: Fri Jun 5 09:45:59 2009
New Revision: 781968
URL: http://svn.apache.org/viewvc?rev=781968&view=rev
Log:
HADOOP-5457. Fix to continue to run builds even if contrib test fails.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/build-contrib.xml
hadoop/core/trunk/src/contrib/build.xml
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=781968&r1=781967&r2=781968&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Jun 5 09:45:59 2009
@@ -785,6 +785,9 @@
HADOOP-5859. Fix "wait() or sleep() with locks held" findbugs warnings in
DFSClient. (Kan Zhang via szetszwo)
+
+ HADOOP-5457. Fix to continue to run builds even if contrib test fails
+ (Giridharan Kesavan via gkesavan)
Release 0.20.1 - Unreleased
Modified: hadoop/core/trunk/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/build-contrib.xml?rev=781968&r1=781967&r2=781968&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/build-contrib.xml (original)
+++ hadoop/core/trunk/src/contrib/build-contrib.xml Fri Jun 5 09:45:59 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/trunk/src/contrib/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/build.xml?rev=781968&r1=781967&r2=781968&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/build.xml (original)
+++ hadoop/core/trunk/src/contrib/build.xml Fri Jun 5 09:45:59 2009
@@ -45,16 +45,21 @@
<!-- 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="mrunit/build.xml"/>
</subant>
+ <available file="${build.contrib.dir}/testsfailed" property="testsfailed"/>
+ <fail if="testsfailed">Tests failed!</fail>
</target>
-
<!-- ====================================================== -->
<!-- Clean all the contribs. -->
<!-- ====================================================== -->
