[Hyperic-hq-discuss] hq r8177 - trunk/build_util

[<tk...@hy...>]

Author: tkeeney
Date: 2008-03-11 12:39:12 -0700 (Tue, 11 Mar 2008)
New Revision: 8177
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=8177

Modified:
   trunk/build_util/test-build.xml
Log:
Moving the junitResults.dir delete into a dependent target so that this target will only be run once per unit-test target (test & cactus targets). If we execute the "test" then "cactus" target, we don't want the "cactus" target to delete the results from the "test" target.

Modified: trunk/build_util/test-build.xml
===================================================================
--- trunk/build_util/test-build.xml	2008-03-11 19:07:46 UTC (rev 8176)
+++ trunk/build_util/test-build.xml	2008-03-11 19:39:12 UTC (rev 8177)
@@ -5,8 +5,11 @@
 	
 <property name="unittest.jboss.home" location="${ENV.UNITTEST_JBOSS_HOME}" />
 
-<target name="test" depends="init,init-taskdefs">
-	<delete dir="${junitResults.dir}"/>
+<target name="init-tests">
+	<delete dir="${junitResults.dir}"/>  
+</target>	
+	
+<target name="test" depends="init,init-taskdefs,init-tests">
     <mkdir dir="${junitResults.dir}"/>
     <junit reloading="no" fork="true" forkmode="once" printsummary="yes" haltonerror="no">
 	  <jvmarg value="-Xmx512m"/>
@@ -44,8 +47,7 @@
 
   </target>
 
-  <target name="cactus" depends="init,init-taskdefs">
-	<delete dir="${junitResults.dir}"/>  
+  <target name="cactus" depends="init,init-taskdefs,init-tests">
     <mkdir dir="${junitResults.dir}"/>
     <junit reloading="no" fork="no" printsummary="yes" haltonerror="no">
       <classpath>