Author: cos
Date: Thu Jan 28 19:30:43 2010
New Revision: 904225
URL: http://svn.apache.org/viewvc?rev=904225&view=rev
Log:
HADOOP-6506. Failing tests prevent the rest of test targets from execution.
Contributed by Konstantin Boudnik.
Modified:
hadoop/common/branches/branch-0.20/CHANGES.txt
hadoop/common/branches/branch-0.20/build.xml
Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=904225&r1=904224&r2=904225&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Thu Jan 28 19:30:43 2010
@@ -100,6 +100,9 @@
HADOOP-6498. IPC client bug may cause rpc call hang. (Ruyue Ma and
hairong via hairong)
+ HADOOP-6596. Failing tests prevent the rest of test targets from
+ execution. (cos)
+
Release 0.20.1 - 2009-09-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.20/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/build.xml?rev=904225&r1=904224&r2=904225&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/build.xml (original)
+++ hadoop/common/branches/branch-0.20/build.xml Thu Jan 28 19:30:43 2010
@@ -704,6 +704,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}"/>
@@ -747,9 +748,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}"/>
@@ -757,8 +763,15 @@
</subant>
</target>
- <target name="test" depends="test-core, test-contrib" description="Run core,
contrib unit tests">
- </target>
+ <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. -->
<target name="test-cluster" description="Run all unit tests, not just Test*,
and use non-test configuration.">
