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

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

Author: smarlow at redhat.com
Date: 2010-06-18 17:35:57 -0400 (Fri, 18 Jun 2010)
New Revision: 106183

Modified:
   branches/Branch_No_Multicast/testsuite/build.xml
   branches/Branch_No_Multicast/testsuite/imports/server-config.xml
Log:
run messaging test, clustered messaging test is TBD and binding service is not working yet.

Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml	2010-06-18 20:33:56 UTC (rev 106182)
+++ branches/Branch_No_Multicast/testsuite/build.xml	2010-06-18 21:35:57 UTC (rev 106183)
@@ -1659,11 +1659,26 @@
       description="Runs the various test targets, but against cluster-ec2 config" depends="init">
 		
 		<property name="conf" value="cluster-ec2"/>
+		<property name="baseconf" value="cluster-ec2"/>
+
+<!--    Need to figure out why AS doesn't startup correctly for binding manager test (error initializing S3_PING)
+        <antcall target="tests-binding-manager"/>
+-->
+        <antcall target="tests-jbossmessaging"/>
+
+<!-- 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"/>
+
+
+
 	   
 	   <antcall target="tests-report"/>
 	   <!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368 
@@ -1839,9 +1854,11 @@
 
    <target name="tests-binding-manager"
      description="Test for clean startup with service binding manager">
-   	
-     <create-cluster-node conf="binding-manager1"/>
-     <create-cluster-node conf="binding-manager2"/>
+
+     <property name="baseconf" value="all"/>
+ 	
+     <create-cluster-node conf="binding-manager1" baseconf="${baseconf}"/>
+     <create-cluster-node conf="binding-manager2"  baseconf="${baseconf}"/>
      <server:start name="binding-manager1"/>
      <server:start name="binding-manager2"/>
 
@@ -3497,6 +3514,8 @@
    <target name="tests-jbossmessaging"
       description="Run JMS tests against the Messaging JMS provider" unless="build.ewp">
 
+      <property name="baseconf" value="all"/>
+
    	  <antcall target="create-server-jbossmessaging"/>
    	
       <server:start name="jbossmessaging"/>
@@ -3506,7 +3525,7 @@
 	
    <target name ="create-server-jbossmessaging">
     <!-- Create a separate messaging config -->
-    <create-config baseconf="default" newconf="jbossmessaging">
+    <create-config baseconf="${baseconf}" newconf="jbossmessaging">
        <patternset>
           <include name="conf/**"/>
           <include name="deployers/**"/>

Modified: branches/Branch_No_Multicast/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-06-18 20:33:56 UTC (rev 106182)
+++ branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-06-18 21:35:57 UTC (rev 106183)
@@ -1356,7 +1356,7 @@
       <attribute name="baseconf"/>
    	<sequential>
          <delete dir="${jboss.dist}/server/@{conf}" failonerror="false"/>
-         <echo message="creating @{conf} config, jboss.dist=${jboss.dist}"/>
+         <echo message="creating @{conf} config, jboss.dist=${jboss.dist}, from @{baseconf}"/>
          <copy todir="${jboss.dist}/server/@{conf}">
             <fileset dir="${jboss.dist}/server/@{baseconf}">
                <include name="conf/**"/>
@@ -1377,10 +1377,10 @@
    <!-- A macro for creating a test cluster config -->
    <macrodef name="create-cluster-node"
       description="Create a simplified cluster configuration">
-      
+      <attribute name="baseconf" />      
       <attribute name="conf"/>
    	<sequential>
-   	   <create-cluster-node-from-baseconf conf="@{conf}" baseconf="all"/>
+   	   <create-cluster-node-from-baseconf conf="@{conf}" baseconf="@{baseconf}" />
    	</sequential>
    </macrodef>