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

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

Author: tkeeney
Date: 2008-03-31 14:15:13 -0700 (Mon, 31 Mar 2008)
New Revision: 8608
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=8608

Modified:
   trunk/build_util/dbsetup-build.xml
Log:
Refactored unit test database dump file deletion into its own target.

Modified: trunk/build_util/dbsetup-build.xml
===================================================================
--- trunk/build_util/dbsetup-build.xml	2008-03-31 21:01:40 UTC (rev 8607)
+++ trunk/build_util/dbsetup-build.xml	2008-03-31 21:15:13 UTC (rev 8608)
@@ -175,10 +175,7 @@
   </target> 
 
   <!-- DBSetup target for unittest framework -->
-  <target name="test-dbsetup">
-    <!-- this file is used for hqdb data dump during test framework execution -->
-    <delete file="${hq.home}/unittest/data/hqdb.dump.xml.gz" />
-	  	  
+  <target name="test-dbsetup" depends="delete-dump">	  	  
     <property name="unittest-lib" location="${hq.home}/unittest/lib" />
     <echo message="using unittest.lib as -> ${unittest-lib}"/>
     <antcall target="dbsetup">
@@ -195,11 +192,7 @@
           depends="dbsetup-combine,dbsetup-replace,dbsetup-uninstall,dbsetup-schema"
           description="Create an empty schema in the database, without any data."/>
 
-  <target name="dbsetup-upgrade" depends="init-taskdefs">
-
-    <!-- this file is used for hqdb data dump during test framework execution -->
-    <delete file="${hq.home}/unittest/data/hqdb.dump.xml.gz" />
-
+  <target name="dbsetup-upgrade" depends="init-taskdefs,delete-dump">
     <ant antfile="${hq.home}/installer/data/db-upgrade.xml"
          target="upgrade"
          inheritAll="true"
@@ -211,5 +204,10 @@
       <property name="schema.target" value="${hq.schema.target.version}"/>
     </ant>
   </target>
+	
+  <target name="delete-dump">
+    <!-- this file is used for hqdb data dump during unit test framework execution -->
+    <delete file="${hq.home}/unittest/data/hqdb.dump.xml.gz" />	  
+  </target>	
 
 </project>