[jboss-cvs] jboss-portal/server ...

[Rali Genova]

  User: rgenova 
  Date: 06/07/24 16:44:29

  Modified:    server   build.xml
  Log:
  updated testsuite module and all modules that are currently running tests
  
  Revision  Changes    Path
  1.40      +89 -93    jboss-portal/server/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/server/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -b -r1.39 -r1.40
  --- build.xml	16 Jul 2006 23:38:54 -0000	1.39
  +++ build.xml	24 Jul 2006 20:44:29 -0000	1.40
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.39 2006/07/16 23:38:54 julien Exp $ -->
  +<!-- $Id: build.xml,v 1.40 2006/07/24 20:44:29 rgenova Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -144,12 +144,6 @@
            <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
         </jar>
   
  -      <!-- -->
  -      <jar jarfile="${build.lib}/portal-server-test-lib.jar">
  -         <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
  -      </jar>
  -
  -      <!-- -->
         <copy todir="${build.resources}/portal-server-sar">
            <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
            <fileset dir="${build.lib}/" includes="portal-server-lib.jar"/>
  @@ -157,13 +151,18 @@
         <jar jarfile="${build.lib}/portal-server.sar">
            <fileset dir="${build.resources}/portal-server-sar"/>
         </jar>
  +	      <jar jarfile="${build.lib}/portal-server-test-lib.jar">
  +	         <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
  +	       </jar>
  +	   </target>
  +	   
  +	   <!-- generates artifacts used for tests, requires output to be previously run -->
  +	   <target name="package-tests" depends="init"> 
   
  -      <!-- -->
         <jar jarfile="${build.lib}/test-agent.war">
            <fileset dir="${build.resources}/test-agent-war"/>
         </jar>
   
  -      <!-- -->
         <jar jarfile="${build.lib}/test-parameters.sar">
   
            <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
  @@ -174,7 +173,6 @@
            <fileset dir="${build.resources}/test/test-parameters-sar"/>
         </jar>
   
  -      <!-- -->
         <jar jarfile="${build.lib}/test-servlet-rootpathmapping.war">
            <fileset dir="${build.resources}/test/test-servlet-rootpathmapping-war"/>
         </jar>
  @@ -197,7 +195,6 @@
            <fileset dir="${build.lib}" includes="test-servlet-defaultservletmapping.war"/>
         </jar>
   
  -      <!-- -->
         <jar jarfile="${build.lib}/test-session.war">
            <fileset dir="${build.resources}/test/test-session-war"/>
         </jar>
  @@ -212,7 +209,6 @@
            <fileset dir="${build.lib}" includes="test-session.war"/>
         </jar>
   
  -      <!-- -->
         <jar jarfile="${build.lib}/test-charset.sar">
   
            <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
  @@ -270,7 +266,7 @@
         <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-server.sar"/>
      </target>
   
  -   <target name="test" depends="init">
  +   <target name="tests" depends="init">
         <execute-tests>
            <x-sysproperty>
               <sysproperty key="test.root" value="${build.lib}"/>