[jboss-cvs] JBossAS SVN: r106307 - in branches/Branch_No_Multicast/testsuite: imports/config and 1 other directory.

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

Author: pferraro
Date: 2010-06-29 10:05:46 -0400 (Tue, 29 Jun 2010)
New Revision: 106307

Modified:
   branches/Branch_No_Multicast/testsuite/build.xml
   branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml
Log:
Replicate tests-cluster-ec2 for mod_cluster-ec2 profile
Rename old tests-mod_cluster-ec2 -> tests-clustering-mod_cluster-ec2

Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml	2010-06-29 13:44:53 UTC (rev 106306)
+++ branches/Branch_No_Multicast/testsuite/build.xml	2010-06-29 14:05:46 UTC (rev 106307)
@@ -1656,52 +1656,85 @@
       <antcall target="tests-aspects"/>
       <server:stop name="${conf}"/>
    </target>
-	
-	<target name="tests-cluster-ec2"
-      description="Runs the various test targets, but against cluster-ec2 config" depends="init">
-	<record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>	
-		<property name="conf" value="cluster-ec2"/>
-		<property name="baseconf" value="cluster-ec2"/>
+   
+   <target name="tests-cluster-ec2" description="Runs the various test targets, but against cluster-ec2 config" depends="init">
+      <record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>
+      <property name="conf" value="cluster-ec2"/>
+      <property name="baseconf" value="cluster-ec2"/>
 
-        <!--antcall target="tests-jbossmessaging"/>
+      <!--antcall target="tests-jbossmessaging"/-->
 
-        <antcall target="tests-binding-manager"/>
--->
+      <!--antcall target="tests-binding-manager"/-->
 <!-- Temporarily disabling, doesn't work with hornetq, need to conditionally run this target only for jboss messaging
       <antcall target="tests-jbossmessaging-cluster"/>
 -->
 
+      <antcall target="jboss-all-config-tests" inheritrefs="true">
+         <param name="custom.excludes" value="ec2.excludes"/>
+      </antcall>
+      <antcall target="tests-clustering-cluster-ec2" inheritrefs="true">
+         <param name="custom.excludes" value="ec2.excludes"/>
+      </antcall>
 
 
-		<antcall target="jboss-all-config-tests" inheritrefs="true">
-			<param name="custom.excludes" value="ec2.excludes"/>
-	        </antcall>
-		<antcall target="tests-clustering-cluster-ec2" inheritrefs="true">
-			<param name="custom.excludes" value="ec2.excludes"/>
-	        </antcall>
+      <antcall target="tests-report"/>
+      <!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368 
+         <record name="${basedir}/output/tests.log" action="stop"/>
+      -->
+      <condition property="servers.shutdown.failed">
+         <and>
+            <not><isset property="servers.shutdown.nocheck"/></not>
+            <isfileselected file="output/tests.log">
+               <or>
+                  <contains text="Unable to shutdown server properly"/>
+                  <not><contains text="[server:stop]"/></not>
+               </or>
+            </isfileselected>
+         </and>
+      </condition>
+      <fail message="Some servers failed to shutdown cleanly."
+            if="servers.shutdown.failed"/>
+   </target>
+   
+   <target name="tests-mod_cluster-ec2" description="Runs the various test targets, but against mod_cluster-ec2 config" depends="init">
+      <record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>
+      <property name="conf" value="mod_cluster-ec2"/>
+      <property name="baseconf" value="mod_cluster-ec2"/>
 
+      <!--antcall target="tests-jbossmessaging"/-->
 
+      <!--antcall target="tests-binding-manager"/-->
+<!-- Temporarily disabling, doesn't work with hornetq, need to conditionally run this target only for jboss messaging
+      <antcall target="tests-jbossmessaging-cluster"/>
+-->
 
-	   
-	   <antcall target="tests-report"/>
-	   <!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368 
-	     <record name="${basedir}/output/tests.log" action="stop"/>
-	   -->
-	   <condition property="servers.shutdown.failed">
-	      <and>
-	         <not><isset property="servers.shutdown.nocheck"/></not>
-	         <isfileselected file="output/tests.log">
-	            <or>
-	               <contains text="Unable to shutdown server properly"/>
-	               <not><contains text="[server:stop]"/></not>
-	            </or>
-	         </isfileselected>
-	      </and>
-	   </condition>
-	   <fail message="Some servers failed to shutdown cleanly."
-	         if="servers.shutdown.failed"/>
-	</target>
+      <antcall target="jboss-all-config-tests" inheritrefs="true">
+         <param name="custom.excludes" value="ec2.excludes"/>
+      </antcall>
+      <antcall target="tests-clustering-mod_cluster-ec2" inheritrefs="true">
+         <param name="custom.excludes" value="ec2.excludes"/>
+      </antcall>
 
+
+      <antcall target="tests-report"/>
+      <!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368 
+         <record name="${basedir}/output/tests.log" action="stop"/>
+      -->
+      <condition property="servers.shutdown.failed">
+         <and>
+            <not><isset property="servers.shutdown.nocheck"/></not>
+            <isfileselected file="output/tests.log">
+               <or>
+                  <contains text="Unable to shutdown server properly"/>
+                  <not><contains text="[server:stop]"/></not>
+               </or>
+            </isfileselected>
+         </and>
+      </condition>
+      <fail message="Some servers failed to shutdown cleanly."
+            if="servers.shutdown.failed"/>
+   </target>
+
    <target name="smoke-tests"
       description="A basic set of units tests which are run against the jboss all config" depends="init">
       <server:start name="all"/>

Modified: branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml	2010-06-29 13:44:53 UTC (rev 106306)
+++ branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml	2010-06-29 14:05:46 UTC (rev 106307)
@@ -502,7 +502,7 @@
 
   </target>
 
-  <target name="tests-mod_cluster-ec2">
+  <target name="tests-clustering-mod_cluster-ec2">
 
     <!-- Create tests-configs content for cluster-tcp-0/1 from the cluster-udp content -->
     <mkdir dir="${build.resources}/test-configs/cluster-tcp-0"/>