[jboss-cvs] jbosstest build.xml

[Clebert R. S. <cl...@us...>]

  User: clebert 
  Date: 05/01/26 15:01:44

  Modified:    .        Tag: Branch_4_0 build.xml
  Log:
  Merge with changes on Head for doing multiple JUnit configurations
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.406.2.35 +8 -2      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.406.2.34
  retrieving revision 1.406.2.35
  diff -u -r1.406.2.34 -r1.406.2.35
  --- build.xml	14 Jan 2005 06:17:24 -0000	1.406.2.34
  +++ build.xml	26 Jan 2005 23:01:25 -0000	1.406.2.35
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.406.2.34 2005/01/14 06:17:24 bwang00 Exp $ -->
  +<!-- $Id: build.xml,v 1.406.2.35 2005/01/26 23:01:25 clebert Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -715,6 +715,7 @@
   
         <antcall target="tests-clustering-unit">
            <param name="cluster.includes.refid" value="apache_tomcat.cluster.includes"/>
  +         <param name="jboss-junit-configuration" value="Tomcat Clustering"/>
         </antcall>
         <stop-jboss url="${node0.jndi.url}"/>
         <stop-jboss url="${node1.jndi.url}"/>
  @@ -737,6 +738,7 @@
   
         <antcall target="tests-clustering-unit">
            <param name="cluster.includes.refid" value="cluster.includes"/>
  +         <param name="jboss-junit-configuration" value="Two Nodes"/>
         </antcall>
         <antcall target="tests-clustering-shutdown" />
   
  @@ -749,6 +751,7 @@
   
         <antcall target="tests-clustering-unit">
            <param name="cluster.includes.refid" value="cluster.includes"/>
  +         <param name="jboss-junit-configuration" value="New Configuration tests-clustering"/>
         </antcall>
         <antcall target="tests-clustering-shutdown" />
      </target>
  @@ -951,6 +954,7 @@
         <sleep seconds="10"/>
         <antcall target="tests-clustering-unit">
            <param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
  +         <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/>
         </antcall>
   
         <stop-jboss url="${node0.jndi.url}"/>
  @@ -1129,7 +1133,9 @@
               <path refid="tests.classpath"/>
            </classpath>
   
  -         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
  +	 <!-- definition of the property for keeping results between configuration -->
  +	 <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
  +         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" />
   
            <batchtest todir="${build.reports}"
               haltonerror="${junit.batchtest.haltonerror}"