[jboss-cvs] JBossAS SVN: r97794 - in trunk/testsuite: imports and 1 other directory.

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

Author: jhalliday
Date: 2009-12-14 12:48:34 -0500 (Mon, 14 Dec 2009)
New Revision: 97794

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
Support running of test groups or individual tests with server start/stop in a single command. JBAS-7537


Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-12-14 17:14:43 UTC (rev 97793)
+++ trunk/testsuite/build.xml	2009-12-14 17:48:34 UTC (rev 97794)
@@ -536,6 +536,7 @@
    <property name="install.id" value="${module.name}-${module.version}"/>
    <property name="release.id" value="${install.id}"/>
    <property name="install.root" value="${module.output}/${install.id}"/>
+   <property name="generic.config" value="${server}"/>
 
    <!-- Import the jboss server run targets -->
    <import file="imports/server-config.xml"/>
@@ -3420,6 +3421,26 @@
       </junit>
    </target>
 
+	<!-- run a specific group of tests using the specified server e.g.
+        ./build.sh -Dserver=default -Dtest=tm test-with-server -->
+	<target name="test-with-server" if="server" depends="init" 
+			description="Execute a single test group with specified server config startup/shutdown">
+		<echo message="starting server ${server}"/>
+		<server:start name="generic"/>
+		<antcall target="test" inheritRefs="true"/>
+		<server:stop name="generic"/> 
+	</target>
+
+	<!-- run a specific test using the specified server e.g.
+        ./build.sh -Dserver=default -Dtest=org.jboss.test.tm.test.TransactionLocalUnitTestCase one-test-with-server -->
+	<target name="one-test-with-server" if="server" depends="init"
+			description="Execute a single test with specified server config startup/shutdown">
+		<echo message="starting server ${server}"/>
+		<server:start name="generic"/>
+		<antcall target="one-test" inheritRefs="true"/>
+		<server:stop name="generic"/>
+	</target>
+
    <!--
       | Run a single testcase by specifing the fully qualified class name
       | of the unit test using the test property, -Dtest=org.jboss.test....

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2009-12-14 17:14:43 UTC (rev 97793)
+++ trunk/testsuite/imports/server-config.xml	2009-12-14 17:48:34 UTC (rev 97794)
@@ -116,6 +116,16 @@
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       </server>
+      <server name="generic" config="${generic.config}" host="${node0}" >
+         <jvmarg value="-Xms128m" />
+         <jvmarg value="-Xmx512m" />
+         <jvmarg value="-XX:MaxPermSize=512m" />
+         <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+         <jvmarg value="-XX:-UseGCOverheadLimit" />
+         <sysproperty key="java.net.preferIPv4Stack" value="true" />
+         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+      </server>
       <server name="securitymgr" config="secmgr" host="${node0}">
          <jvmarg value="${jpda.cmdline}" />
          <jvmarg value="-Xms128m" />