Author: omalley
Date: Fri Mar 4 03:44:07 2011
New Revision: 1077131
URL: http://svn.apache.org/viewvc?rev=1077131&view=rev
Log:
commit 00fb6f03ca8d7bedcbe01909c8ee614444bd684f
Author: Konstantin Boudnik <[email protected]>
Date: Wed Jan 27 14:56:19 2010 -0800
HADOOP-6506 from
https://issues.apache.org/jira/secure/attachment/12431614/HADOOP-6506-ydist-0.20.patch
+++ b/YAHOO-CHANGES.txt
+ HADOOP-6506. Failing tests prevent the rest of test targets from
+ execution. (cos)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/build.xml
Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077131&r1=1077130&r2=1077131&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar 4
03:44:07 2011
@@ -793,6 +793,7 @@
<!-- ================================================================== -->
<target name="test-core" depends="jar-test" description="Run core unit
tests">
+ <delete file="${test.build.dir}/testsfailed"/>
<delete dir="${test.build.data}"/>
<mkdir dir="${test.build.data}"/>
<delete dir="${test.log.dir}"/>
@@ -857,9 +858,14 @@
<fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
</batchtest>
</junit>
- <fail if="tests.failed">Tests failed!</fail>
+ <antcall target="checkfailure"/>
</target>
+ <target name="checkfailure" if="tests.failed">
+ <touch file="${test.build.dir}/testsfailed"/>
+ <fail unless="continueOnFailure">Tests failed!</fail>
+ </target>
+
<target name="test-contrib" depends="compile, compile-core-test"
description="Run contrib unit tests">
<subant target="test">
<property name="version" value="${version}"/>
@@ -867,9 +873,14 @@
</subant>
</target>
- <target name="test" depends="test-core, test-contrib,
- run-test-core-fault-inject"
- description="Run core, contrib, fault injection tests">
+ <target name="test" description="Run core, contrib, fault injection tests">
+ <delete file="${test.build.dir}/testsfailed"/>
+ <property name="continueOnFailure" value="true"/>
+ <antcall target="test-core"/>
+ <antcall target="test-contrib"/>
+ <antcall target="run-test-core-fault-inject"/>
+ <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
+ <fail if="testsfailed">Tests failed!</fail>
</target>
<!-- Run all unit tests, not just Test*, and use non-test configuration. -->
