[jboss-cvs] jbosstest build.xml

[Ryan C. <rec...@us...>]

  User: recampbell
  Date: 05/03/29 16:07:34

  Modified:    .        Tag: Branch_4_0 build.xml
  Log:
  Added wait-on-shutdown calls to prevent the next configuration from starting before the previous one has completely shutdown and released all ports.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.406.2.49 +11 -1     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.406.2.48
  retrieving revision 1.406.2.49
  diff -u -r1.406.2.48 -r1.406.2.49
  --- build.xml	28 Mar 2005 03:47:05 -0000	1.406.2.48
  +++ build.xml	30 Mar 2005 00:07:29 -0000	1.406.2.49
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.406.2.48 2005/03/28 03:47:05 ovidiuf Exp $ -->
  +<!-- $Id: build.xml,v 1.406.2.49 2005/03/30 00:07:29 recampbell Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -806,6 +806,8 @@
      <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
         <stop-jboss url="${node0.jndi.url}"/>
         <stop-jboss url="${node1.jndi.url}"/>
  +      <wait-on-shutdown conf="node0"/>
  +      <wait-on-shutdown conf="node1"/>
      </target>
      <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
         <echo message="Waiting for nodes to start..."/>
  @@ -873,6 +875,7 @@
            </batchtest>
         </junit>
         <stop-jboss/>
  +      <wait-on-shutdown conf="tomcat-ssl"/>
      </target>
   
      <!-- Tests of tomcat requiring SSO configured
  @@ -928,6 +931,7 @@
            </batchtest>
         </junit>
         <stop-jboss/>
  +      <wait-on-shutdown conf="tomcat-sso"/>
      </target>
   
      <target name="tomcat-sso-clustered-tests"
  @@ -987,6 +991,8 @@
   
         <stop-jboss url="${node0.jndi.url}"/>
         <stop-jboss url="${node1.jndi.url}"/>
  +      <wait-on-shutdown conf="tomcat-sso-cluster0"/>
  +      <wait-on-shutdown conf="tomcat-sso-cluster1"/>
      </target>
      
      <target name="test-example-binding-manager"
  @@ -1050,6 +1056,7 @@
            <param name="jboss-junit-configuration" value="DeploymentService"/>
         </antcall>
         <stop-jboss/>
  +      <wait-on-shutdown conf="deployment-service"/>
      </target>
      
      <target name="deployment-service-unit-tests">
  @@ -1460,6 +1467,7 @@
         </junit>
   
         <stop-jboss/>
  +      <wait-on-shutdown conf="default"/>
      </target>
   
      <!-- Tests of the JACC security implementation -->
  @@ -1541,6 +1549,7 @@
         </junit>
   
         <stop-jboss/>
  +      <wait-on-shutdown conf="jacc"/>
      </target>
   
      <target name="tests-jacc-securitymgr"
  @@ -1624,6 +1633,7 @@
         </junit>
   
         <stop-jboss/>
  +      <wait-on-shutdown conf="jacc"/>
      </target>
   
      <target name="tests-standalone-aop-unit" depends="maybejars">