Description: Don't launch unit test with main Ant targets
 and don't return failure of build if one unit test fail.
Forwarded: not-needed
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2009-10-21
--- a/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml
+++ b/_shared/common-ant/common-ant-tasks-deploy.ant-inc.xml
@@ -7,7 +7,7 @@
     
     <target name="_shared.common.deploy"
             depends="_shared.common.deploy-setup,
-                javac,jar,test-all,doc,java-doc" >
+                javac,jar,doc,java-doc" >
         <!-- deploy structure was setup in jar task -->
 
         <zip zipfile="${output.doc-zip}" basedir="${dirs.deploy.docs}"
--- a/_shared/common-ant/common-ant-tasks-test.ant-inc.xml
+++ b/_shared/common-ant/common-ant-tasks-test.ant-inc.xml
@@ -40,11 +40,9 @@
     
     
     <target name="_shared.common.test-failed" if="tests.failure" >
-        <fail message="jUnit failure(s)" />
     </target>
     
     <target name="_shared.common.test-errored" if="tests.error" >
-        <fail message="jUnit error(s)" />
     </target>
     
     
@@ -84,7 +82,6 @@
             <source destdir="work/coverage/report"
                 title="GroboUtils Coverage for ${product}-${version}"
                 srcdir="${dirs.sources.dev}" />
-            <failon percentage="60" />
         </grobo-report>
     </target>
     
--- a/build.xml
+++ b/build.xml
@@ -107,6 +107,15 @@
             <property name="GroboUtils.main.target" value="main" />
         </ant>
     </target>
+
+
+    <target name="test-all">
+        <!-- reload this build file to allow the whole dependency tree
+            to be executed -->
+        <ant target="GroboUtils.main.all-targets" dir="${basedir}">
+            <property name="GroboUtils.main.target" value="test-all" />
+        </ant>
+    </target>
     
     
     <!-- ****************************************************************** -->
--- a/codecoverage/build.xml
+++ b/codecoverage/build.xml
@@ -100,8 +100,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/pmti/build.xml
+++ b/pmti/build.xml
@@ -83,8 +83,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/testing-autodoc/build.xml
+++ b/testing-autodoc/build.xml
@@ -70,8 +70,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/testing-junit/build.xml
+++ b/testing-junit/build.xml
@@ -79,8 +79,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/testing-mbtf/build.xml
+++ b/testing-mbtf/build.xml
@@ -77,8 +77,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/testing-tp/build.xml
+++ b/testing-tp/build.xml
@@ -74,8 +74,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/uicapture/build.xml
+++ b/uicapture/build.xml
@@ -75,8 +75,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/util-classes/build.xml
+++ b/util-classes/build.xml
@@ -67,8 +67,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc,deploy" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/util-datastruct/build.xml
+++ b/util-datastruct/build.xml
@@ -75,8 +75,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/util-io/build.xml
+++ b/util-io/build.xml
@@ -75,8 +75,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/util-states/build.xml
+++ b/util-states/build.xml
@@ -75,8 +75,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/util-thread/build.xml
+++ b/util-thread/build.xml
@@ -77,8 +77,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc,deploy" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />
--- a/util-xml/build.xml
+++ b/util-xml/build.xml
@@ -73,8 +73,8 @@
     
     <!-- Targets -->
 
-    <target name="all" depends="init,clean,javac,jar,test-all,doc,java-doc,deploy" />
-    <target name="main" depends="init,javac,jar,test-all" />
+    <target name="all" depends="init,clean,javac,jar,doc,java-doc" />
+    <target name="main" depends="init,javac,jar" />
 
     <target name="deploy" depends="init,_shared.common.deploy" />
     <target name="init" depends="_shared.common.init" />