[Jboss-cvs] JBossAS SVN: r56082 - trunk/testsuite

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

Author: bstansberry at jboss.com
Date: 2006-08-18 17:37:53 -0400 (Fri, 18 Aug 2006)
New Revision: 56082

Modified:
   trunk/testsuite/build.xml
Log:
Create a one-cluster-test target

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2006-08-18 20:10:44 UTC (rev 56081)
+++ trunk/testsuite/build.xml	2006-08-18 21:37:53 UTC (rev 56082)
@@ -547,6 +547,9 @@
     <exclude name="org/jboss/test/testbeancluster/test/*TestCase.class"/>
     <exclude name="org/jboss/test/ha/farm/test/*TestCase.class" />
    </patternset>
+   <patternset id="one.test.includes">
+      <include name="${test}"/>
+   </patternset>   
    <!-- The compatibility tests need extra memory -->
    <patternset id="compatibility.includes">
      <include name="org/jboss/test/compatibility/test/*TestCase.class"/>
@@ -875,6 +878,9 @@
   <target name="tests-clustering"
     description="Execute clustering tests requiring two nodes.">
 
+    <!-- If jboss-junit-configuration wasn't passed in, set it now -->
+    <property name="jboss-junit-configuration" value="UDP"/>
+
     <antcall target="tests-clustering-configure" inheritRefs="true"/>
 
     <server:start name="cluster-${jboss-junit-configuration}-0"/>
@@ -3307,7 +3313,7 @@
       </junit>
    </target>
 
-      <target name="one-test-debug" if="test"
+   <target name="one-test-debug" if="test"
       description="Execute a single test.">
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
@@ -3447,7 +3453,29 @@
             fork="${junit.batchtest.fork}"/>
       </junit>
    </target>
+   
+   <target name="one-cluster-test" if="test">
 
+    <property name="jboss-junit-configuration" value="UDP"/>
+
+    <antcall target="tests-clustering-configure" inheritRefs="true"/>
+
+    <server:start name="cluster-${jboss-junit-configuration}-0"/>
+    <server:start name="cluster-${jboss-junit-configuration}-1"/>
+
+    <echo message="Going to call target tests-clustering-unit for ${test}"/>
+
+    <antcall target="tests-clustering-unit">
+      <param name="cluster.includes.refid" value="one.test.includes"/>
+      <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
+    </antcall>
+
+    <server:stop name="cluster-${jboss-junit-configuration}-0"/>
+    <server:stop name="cluster-${jboss-junit-configuration}-1"/>
+   </target>
+
    <!-- Misc tests of the testing framework itself
    -->
    <target name="tests-apache"