Do not abort testing after the first failure,

but report about existence of failures after all the tests were run.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@945446 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index bf7df1a..c188c5e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -919,7 +919,9 @@
 
       <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
       <test todir="${tomcat.build}/logs" name="${test.entry}" if="test.entry"/>
-      <batchtest todir="${tomcat.build}/logs" haltonerror="true" haltonfailure="true" unless="test.entry">
+      <batchtest todir="${tomcat.build}/logs" unless="test.entry"
+        errorproperty="test.result.error" failureproperty="test.result.failure" 
+        >
         <fileset dir="test" >
           <!-- Include all by default -->
           <include name="**/Test*.java" />
@@ -930,6 +932,9 @@
         </fileset>
       </batchtest>
     </junit>
+
+    <fail if="test.result.error" message="Some tests completed with an Error. See ${tomcat.build}/logs for details." />
+    <fail if="test.result.failure" message="Some tests completed with a Failure. See ${tomcat.build}/logs for details." />
   </target>
 
   <target name="extras-prepare" >