You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:42:51 UTC
svn commit: r1077118 - in
/hadoop/common/branches/branch-0.20-security-patches/src/contrib:
build-contrib.xml build.xml
Author: omalley
Date: Fri Mar 4 03:42:50 2011
New Revision: 1077118
URL: http://svn.apache.org/viewvc?rev=1077118&view=rev
Log:
commit c026f8e1fc4a322636565feab22ba7e44d2e35c1
Author: Hemanth Yamijala <yh...@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)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/build-contrib.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/build.xml
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/build-contrib.xml?rev=1077118&r1=1077117&r2=1077118&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/build-contrib.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/build-contrib.xml Fri Mar 4 03:42:50 2011
@@ -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>
<!-- ================================================================== -->
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/build.xml?rev=1077118&r1=1077117&r2=1077118&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/build.xml Fri Mar 4 03:42:50 2011
@@ -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>