|
|
@@ -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. -->
|
Owen O'Malley