[jbpm-commits] JBoss JBPM SVN: r5561 - jbpm4/trunk/qa.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Aug 27 05:39:04 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-08-27 05:39:04 -0400 (Thu, 27 Aug 2009)
New Revision: 5561

Modified:
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-db.bat
   jbpm4/trunk/qa/hudson-jbpm4-db.sh
   jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
Log:
made target names for testsuite setup and teardown consistent

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-08-27 09:17:01 UTC (rev 5560)
+++ jbpm4/trunk/qa/build.xml	2009-08-27 09:39:04 UTC (rev 5561)
@@ -60,7 +60,7 @@
 	</target>
 
   <!-- DB INTEGRATION TESTSUITE SETUP -->
-  <target name="db.integration.testsuite.setup"
+  <target name="testsuite.db.setup"
           depends="reinstall.jbpm">
     <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema">
     </ant>
@@ -68,18 +68,17 @@
   </target>
 
   <!-- DB INTEGRATION TESTSUITE TEARDOWN -->
-  <target name="db.integration.testsuite.teardown">
+  <target name="testsuite.db.teardown">
     <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
   </target>
 
   <!-- TOMCAT INTEGRATION TESTSUITE SETUP -->
-  <target name="tomcat.integration.testsuite.setup"
+  <target name="testsuite.tomcat.setup"
   	      depends="reinstall.jbpm"> 
     <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat" />
     <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />
 
   	<!-- to build the jbpm test webapp we start by copying the user webapp -->
-  	<echo message="sldjkflskdfj" />
   	<mkdir dir="${tomcat.home}/webapps/jbpm-test-webapp" />
     <copy todir="${tomcat.home}/webapps/jbpm-test-webapp">
     	<fileset dir="${jbpm.home}/install/generated/user-webapp"/>
@@ -107,13 +106,13 @@
 	</target>
 
   <!-- TOMCAT INTEGRATION TESTSUITE TEARDOWN -->
-  <target name="tomcat.integration.testsuite.teardown">
+  <target name="testsuite.tomcat.teardown">
     <!-- stop tomcat -->
     <ant antfile="${jbpm.home}/install/build.xml" target="stop.tomcat" />
 	</target>
 
 	
-	<target name="integration.testrun.setup" 
+	<target name="testsuite.jboss.setup" 
           depends="reinstall.jbpm"
           description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
     <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
@@ -129,7 +128,16 @@
     <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" />
     <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" />
   </target>
-	
+
+  <target name="testsuite.jboss.teardown"
+            description="drops the jbpm schema and stops jboss">
+    <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" />
+    <antcall target="drop.jbossidm.schema" />
+    <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" />
+  </target>
+
+
+
   <target name="internal.tweak.jbpm.installation.for.integration.testrun"> 
     <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true">
        <fileset dir="jbpm.cfg.jboss.testsuite/jbpm.identity" />
@@ -172,14 +180,6 @@
 			failonerror="false" /-->
 	</target>
 
-  <target name="integration.testrun.teardown"
-            description="drops the jbpm schema and stops jboss">
-    <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" />
-    <antcall target="drop.jbossidm.schema" />
-    <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" />
-  </target>
-
-
   <target name="drop.jbossidm.schema" if="identity.component.idm">
     <ant antfile="${jbossidm.home}/db/build.xml" target="drop.jbossidm.schema" />
   </target>

Modified: jbpm4/trunk/qa/hudson-jbpm4-db.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-db.bat	2009-08-27 09:17:01 UTC (rev 5560)
+++ jbpm4/trunk/qa/hudson-jbpm4-db.bat	2009-08-27 09:39:04 UTC (rev 5561)
@@ -3,6 +3,6 @@
 @echo database: %1
 
 cmd /C mvn -U -Pdistro clean install
-cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.setup
+cmd /C ant -f qa/build.xml -Ddatabase=%1 testsuite.db.setup
 cmd /C mvn -Ddatabase=%1 test
-cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.teardown
+cmd /C ant -f qa/build.xml -Ddatabase=%1 testsuite.db.teardown

Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-db.sh	2009-08-27 09:17:01 UTC (rev 5560)
+++ jbpm4/trunk/qa/hudson-jbpm4-db.sh	2009-08-27 09:39:04 UTC (rev 5561)
@@ -3,6 +3,6 @@
 # runs the smoke test suite
 
 mvn -U -Pdistro clean install
-ant -f qa/build.xml -Ddatabase=$DATABASE db.integration.testsuite.setup
+ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.setup
 mvn -Ddatabase=$DATABASE test
-ant -f qa/build.xml -Ddatabase=$DATABASE db.integration.testsuite.teardown
+ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.teardown

Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat	2009-08-27 09:17:01 UTC (rev 5560)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat	2009-08-27 09:39:04 UTC (rev 5561)
@@ -1,14 +1,9 @@
 
 set MAVEN_OPTS=-Xms1024M -Xmx1024M
 
-cmd /C ant -f modules/distro/src/main/files/jboss/build.xml reinstall.jbossidm
-
 cmd /C mvn -U -Pdistro clean install
-
-cmd /C ant -f qa/build.xml -Djbpm.debug=true integration.testrun.setup
-
+cmd /C ant -f qa/build.xml testsuite.jboss.setup
 cmd /C mvn -U -Djboss.bind.address=localhost -Ddatabase=hsqldb test
+cmd /C ant -f qa/build.xml testsuite.jboss.teardown
 
-cmd /C ant -f qa/build.xml integration.testrun.teardown
-
 echo 



More information about the jbpm-commits mailing list