[rhmessaging-commits] rhmessaging commits: r3810 - store/branches/java/0.5-release.

[rhmessaging-commits at lists.jboss.org]

Author: rgemmell
Date: 2010-01-20 05:15:23 -0500 (Wed, 20 Jan 2010)
New Revision: 3810

Modified:
   store/branches/java/0.5-release/build.xml
Log:
Update build.xml test process to signal overall failure when individual tests fail


Modified: store/branches/java/0.5-release/build.xml
===================================================================
--- store/branches/java/0.5-release/build.xml	2010-01-19 21:25:35 UTC (rev 3809)
+++ store/branches/java/0.5-release/build.xml	2010-01-20 10:15:23 UTC (rev 3810)
@@ -23,6 +23,7 @@
     <property name="build.test.classes" location="build/test/classes"/>
     <property name="build.tools.classes" location="build/tools/classes"/>
     <property name="build.results"      location="build/results"/>
+    <property name="build.failed"       location="${build.results}/FAILED"/>
     <property name="project.namever"       value="${project.name}-${project.version}"/>
     <property name="bdbstore.jar"	location="${build.dir}/qpid-bdbstore-${project.version}.jar"/>
     <property name="bdbtools.jar"       location="${build.dir}/qpid-bdbtools-${project.version}.jar"/>
@@ -106,7 +107,7 @@
   <target name="test" depends="build-tests,prepare-tests" if="src.test.dir.exists"
          unless="${dontruntest}" description="execute unit tests">
 
-    <delete file="${module.failed}"/>
+    <delete file="${build.failed}"/>
 
     <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
            haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
@@ -143,12 +144,12 @@
       </batchtest>
     </junit>
 
-    <!--antcall target="touch-failed"/-->
+    <antcall target="touch-failed"/>
 
     <condition property="failed">
       <and>
         <isfalse value="${test.failures.ignore}"/>
-        <available file="${module.failed}"/>
+        <available file="${build.failed}"/>
       </and>
     </condition>
 
@@ -156,6 +157,10 @@
 
   </target>
 
+  <target name="touch-failed" if="test.failures">
+    <touch file="${build.failed}"/>
+  </target>
+
   <target name="prepare" depends="jar">
      <mkdir dir="${release.dir}"/>
   </target>