[jboss-svn-commits] JBL Code SVN: r19632 - in labs/jbossesb/trunk/product: rosetta/tests and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mark.little at jboss.com
Date: 2008-04-18 14:53:10 -0400 (Fri, 18 Apr 2008)
New Revision: 19632

Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/product.properties
   labs/jbossesb/trunk/product/rosetta/tests/build.xml
Log:
http://jira.jboss.com/jira/browse/JBESB-1480

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2008-04-18 18:12:22 UTC (rev 19631)
+++ labs/jbossesb/trunk/product/build.xml	2008-04-18 18:53:10 UTC (rev 19632)
@@ -65,6 +65,18 @@
 	</condition>
 	<property name="org.jboss.esb.optimize" value="on"/>
 	
+	<!-- Halt on error? -->
+	<condition property="org.jboss.esb.build.haltonerror" value="no">
+		<equals arg1="${org.jboss.esb.junit.haltonerror}" arg2="no"/>
+	</condition>
+	<property name="org.jboss.esb.build.haltonerror" value="yes"/>
+
+	<!-- Halt on failure? -->
+	<condition property="org.jboss.esb.build.haltonfailure" value="no">
+		<equals arg1="${org.jboss.esb.junit.haltonfailure}" arg2="no"/>
+	</condition>
+	<property name="org.jboss.esb.build.haltonfailure" value="yes"/>
+	
 	<!-- Path names -->
 	<property name="org.jboss.esb.internal.rosetta" value="esb"/>
 	<property name="org.jboss.esb.internal.dest" location="build"/>

Modified: labs/jbossesb/trunk/product/product.properties
===================================================================
--- labs/jbossesb/trunk/product/product.properties	2008-04-18 18:12:22 UTC (rev 19631)
+++ labs/jbossesb/trunk/product/product.properties	2008-04-18 18:53:10 UTC (rev 19632)
@@ -14,3 +14,7 @@
 #org.jboss.esb.test.ftp.user=<username>
 #org.jboss.esb.test.ftp.pwd=<password>
 #org.jboss.esb.test.ftp.dir=<base directory>
+
+# Uncomment the following if you want more control over junit	 
+#org.jboss.esb.junit.haltonerror=yes	 
+#org.jboss.esb.junit.haltonfailure=yes
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/build.xml	2008-04-18 18:12:22 UTC (rev 19631)
+++ labs/jbossesb/trunk/product/rosetta/tests/build.xml	2008-04-18 18:53:10 UTC (rev 19632)
@@ -102,7 +102,7 @@
 		<copy file="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb-1.0.1.xsd" todir="${org.jboss.esb.tests.classes.dir}"/>
 
 
-        <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
+    	<junit printsummary="yes" haltonerror="${org.jboss.esb.build.haltonerror}" haltonfailure="${org.jboss.esb.build.haltonfailure}" showoutput="no" fork="true">
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
@@ -187,7 +187,7 @@
                     <fileset dir="resources/etc/" includes="persistUnitTestDB*"/>
                 </copy>
 
-	        <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
+	    	<junit printsummary="yes" haltonerror="${org.jboss.esb.build.haltonerror}" haltonfailure="${org.jboss.esb.build.haltonfailure}" showoutput="no" fork="true">
 	            <formatter type="plain" usefile="false"/>
 	            <formatter type="xml"/>
 	            <batchtest todir="${org.jboss.esb.tests.report.dir}">