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

[Julien Viet]

  User: julien  
  Date: 06/07/16 18:51:02

  Modified:    server   build.xml
  Log:
  - extracted common stuff to run tests into a macro available in all modules
  
  Revision  Changes    Path
  1.38      +20 -60    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.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- build.xml	8 Jul 2006 00:33:06 -0000	1.37
  +++ build.xml	16 Jul 2006 22:51:02 -0000	1.38
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.37 2006/07/08 00:33:06 julien Exp $ -->
  +<!-- $Id: build.xml,v 1.38 2006/07/16 22:51:02 julien Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -272,51 +272,12 @@
      </target>
   
      <target name="test" depends="init">
  -
  -      <property name="build.testlog" value="${module.output}/log"/>
  -
  -      <echo><![CDATA[
  -      ${build.reports}
  -      ${build.testlog}
  -      ${module.output}
  -      ${junit.printsummary}
  -      ${junit.batchtest.haltonerror}
  -      ${junit.batchtest.haltonfailure}
  -      ${junit.batchtest.fork}
  -      ${junit.timeout}
  -      ${junit.jvm}
  -      ]]></echo>
  -
  -      <mkdir dir="${build.reports}"/>
  -      <mkdir dir="${build.testlog}"/>
  -
  -      <junit
  -         dir="${module.output}"
  -         printsummary="${junit.printsummary}"
  -         haltonerror="${junit.haltonerror}"
  -         haltonfailure="${junit.haltonfailure}"
  -         fork="${junit.fork}"
  -         timeout="${junit.timeout}"
  -         jvm="${junit.jvm}">
  -
  -         <!--<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787"/>-->
  -
  -         <formatter type="plain" usefile="${junit.formatter.usefile}"/>
  -         <!--<formatter type="xml" usefile="${junit.formatter.usefile}"/>-->
  -         <sysproperty key="build.testlog" value="${build.testlog}"/>
  -         <sysproperty key="build.resources" value="${build.resources}"/>
  -
  +      <execute-tests>
  +         <x-sysproperty>
            <sysproperty key="test.root" value="${build.lib}"/>
  -         <sysproperty key="test.uri" value="/test/"/>
  -
  -         <!-- 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"/>
  -	 
  -
  +            <sysproperty key="test.uri" value="/test/redirect/"/>
  +         </x-sysproperty>
  +         <x-test>
            <!-- Server side tests -->
            <test name="org.jboss.portal.test.server.parameters.ParametersTestSuite"/>
            <test name="org.jboss.portal.test.server.servlet.ServletTestSuite"/>
  @@ -326,8 +287,8 @@
            <!-- Standalone tests -->
            <test name="org.jboss.portal.test.portal.util.PropertiesTestCase"/>
            <test name="org.jboss.portal.test.portal.util.ParametersTestCase"/>
  -
  -         <classpath>
  +         </x-test>
  +         <x-classpath>
               <path refid="jboss.serialization.classpath"/>
               <path refid="jboss.remoting.classpath"/>
               <path refid="jboss.microcontainer.classpath"/>
  @@ -337,8 +298,7 @@
               <pathelement location="${build.resources}"/>
               <path refid="library.classpath"/>
               <path refid="dependentmodule.classpath"/>
  -         </classpath>
  -      </junit>
  -
  +         </x-classpath>
  +      </execute-tests>
      </target>
   </project>