[jboss-cvs] jbosstest build.xml

[Ovidiu F. <ov...@us...>]

  User: ovidiuf 
  Date: 05/03/19 00:18:31

  Modified:    .        Tag: Branch_4_0 build.xml
  Log:
  http://jira.jboss.com/jira/browse/JBAS-1378
  Changed clustering defaults and testsuite build configuration to run tests
  not only with a JGroups UDP stack, but also with a TCP stack.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.406.2.46 +18 -6     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.406.2.45
  retrieving revision 1.406.2.46
  diff -u -r1.406.2.45 -r1.406.2.46
  --- build.xml	16 Mar 2005 04:45:02 -0000	1.406.2.45
  +++ build.xml	19 Mar 2005 08:18:29 -0000	1.406.2.46
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.406.2.45 2005/03/16 04:45:02 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.406.2.46 2005/03/19 08:18:29 ovidiuf Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -565,7 +565,7 @@
         <antcall target="jboss-minimal-tests"/>
         <antcall target="jboss-all-config-tests"/>
         <antcall target="tests-security-manager"/>
  -      <antcall target="tests-clustering"/>
  +      <antcall target="tests-clustering-all-stacks"/>
         <antcall target="tomcat-ssl-tests"/>
         <antcall target="tomcat-sso-tests"/>
         <antcall target="tomcat-sso-clustered-tests"/>
  @@ -741,6 +741,18 @@
         <antcall target="tests-ha-unit"></antcall>
      </target>
   
  +   <!-- Run all clustering tests with two JGroups stacks (UDP and TCP)-->
  +   <target name="tests-clustering-all-stacks"
  +      description="Execute clustering tests requiring two nodes.">
  +      <!-- Test the default UDP stack -->
  +      <antcall target="tests-clustering"/>
  +      <!-- Test a TCP stack -->
  +      <antcall target="tests-clustering">
  +         <param name="jgroups-stack" value="TCP"/>
  +      </antcall>
  +   </target>
  +
  +   <!-- Depending on the value of the ${jgroups-stack} variable, uses different JGroups stacks -->
      <target name="tests-clustering"
         description="Execute clustering tests requiring two nodes.">
         <antcall target="tests-clustering-startup" />
  @@ -770,15 +782,15 @@
      </target>
   
      <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}">
  -      <create-cluster-node conf="node0"/>
  +      <create-cluster-node conf="node0" host="${node0}"/>
         <start-jboss  conf="node0" host="${node0}"/>
  -      <create-cluster-node conf="node1"/>
  +      <create-cluster-node conf="node1" host="${node1}"/>
         <start-jboss  conf="node1" host="${node1}"/>
      </target>
   
      <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}">
  -      <create-cluster-node conf="node0"/>
  -      <create-cluster-node conf="node1"/>
  +      <create-cluster-node conf="node0" host="${node0}"/>
  +      <create-cluster-node conf="node1" host="${node1}"/>
   
         <echo message="Modifying the node0 and node1 Tomcat configuration"/>
         <http-cluster-node-config-change conf="node0"/>