[jboss-cvs] JBossAS SVN: r67476 - in branches/JBPAPP_4_2/testsuite: imports and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2007-11-27 00:41:16 -0500 (Tue, 27 Nov 2007)
New Revision: 67476

Modified:
   branches/JBPAPP_4_2/testsuite/build.xml
   branches/JBPAPP_4_2/testsuite/imports/server-config.xml
Log:
JBPAPP-452 - non clustered (default) tests for JBoss Messaging

Modified: branches/JBPAPP_4_2/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/build.xml	2007-11-27 02:47:23 UTC (rev 67475)
+++ branches/JBPAPP_4_2/testsuite/build.xml	2007-11-27 05:41:16 UTC (rev 67476)
@@ -838,6 +838,7 @@
     <antcall target="tests-aop-scoped"/>
     <antcall target="tests-classloader-leak"/>
     <antcall target="tests-jbmcluster"/>
+    <antcall target="tests-jbmNonCluster"/>
     <antcall target="tests-report"/>
     <record name="${basedir}/build.log" action="stop"/>
   </target>
@@ -1008,6 +1009,34 @@
       
    </target>
 
+   <target name="create-jbmnoncluster">
+      <!-- Create clean configuration -->
+      <delete dir="${jboss.dist}/server/jbm-noncluster" />
+      <create-config baseconf="default" newconf="jbm-noncluster">
+         <patternset>
+            <include name="conf/**"/>
+            <include name="deploy/**"/>
+            <include name="deployers/**"/>
+            <include name="deploy-hasingleton/**"/>
+            <include name="lib/**"/>
+         </patternset>
+      </create-config>
+   </target>
+
+   <target name="tests-jbmNonCluster" if="jbosstest.test.soa"
+       description="Run JBM in standard (default) mode">
+
+      <antcall target="create-jbmnoncluster"/>
+
+      <server:start name="jbm-noncluster"/>
+
+      <antcall target="exec-jbmnonclustered"/>
+
+      <!--  I'm not stopping jbm-cluster2 as this server will be killed during the test -->            
+      <server:stop name="jbm-noncluster"/>
+       
+   </target>
+   
    <target name="tests-jbmcluster" if="jbosstest.test.soa"
    	   description="Run JBM in cluster">
 
@@ -1035,6 +1064,20 @@
       
    </target>
 
+   <target name="exec-jbmnonclustered">
+    <patternset id="jbm-nonclustered">
+      <include name="org/jboss/test/jbossmessaging/perf/*TestCase.class"/>
+      <include name="org/jboss/test/jbossmessaging/ra/*TestCase.class"/>
+      <include name="org/jboss/test/jbossmessaging/test/*TestCase.class"/>
+    </patternset>
+
+    <antcall target="test-execute-units">
+      <param name="includes.refid" value="jbm-nonclustered"/>
+      <param name="jboss-junit-configuration" value="jbm-nonclustered"/>
+    </antcall>
+      
+   </target>
+
 	
 
   <!-- Test netbooting a subset of the default configuration

Modified: branches/JBPAPP_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/imports/server-config.xml	2007-11-27 02:47:23 UTC (rev 67475)
+++ branches/JBPAPP_4_2/testsuite/imports/server-config.xml	2007-11-27 05:41:16 UTC (rev 67476)
@@ -84,6 +84,15 @@
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       </server>
 
+    <server name="jbm-noncluster" host="${node0}">
+       <jvmarg value="-Xms128m" />
+       <jvmarg value="-Xmx512m" />
+       <jvmarg value="-XX:MaxPermSize=512m" />
+       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+        <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+        <sysproperty key="java.net.preferIPv4Stack" value="true" />
+    </server>
+    
    	<server name="jbm-cluster1" host="${node0}">
        <jvmarg value="-Xms128m" />
        <jvmarg value="-Xmx512m" />