[jboss-cvs] jboss-portal/tools/etc/buildfragments ...

[Julien Viet]

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

  Modified:    tools/etc/buildfragments  buildmagic.ent
  Log:
  - extracted common stuff to run tests into a macro available in all modules
  
  Revision  Changes    Path
  1.13      +50 -1     jboss-portal/tools/etc/buildfragments/buildmagic.ent
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: buildmagic.ent
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/tools/etc/buildfragments/buildmagic.ent,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- buildmagic.ent	16 Jul 2006 17:40:51 -0000	1.12
  +++ buildmagic.ent	16 Jul 2006 22:51:02 -0000	1.13
  @@ -1,4 +1,4 @@
  -<!-- $Id: buildmagic.ent,v 1.12 2006/07/16 17:40:51 julien Exp $ -->
  +<!-- $Id: buildmagic.ent,v 1.13 2006/07/16 22:51:02 julien Exp $ -->
   
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->
  @@ -610,6 +610,55 @@
     </target>
     <!-- end _default:tests-->
   
  +   <macrodef name="execute-tests">
  +      <element name="x-sysproperty" optional="true"/>
  +      <element name="x-test"/>
  +      <element name="x-classpath"/>
  +      <sequential>
  +         <property name="build.testlog" value="${module.output}/log"/>
  +         <echo><![CDATA[
  +         build.reports=${build.reports}
  +         build.testlog=${build.testlog}
  +         module.output=${module.output}
  +         junit.printsummary=${junit.printsummary}
  +         junit.batchtest.haltonerror=${junit.batchtest.haltonerror}
  +         junit.batchtest.haltonfailure=${junit.batchtest.haltonfailure}
  +         junit.batchtest.fork=${junit.batchtest.fork}
  +         junit.timeout=${junit.timeout}
  +         junit.jvm=${junit.jvm}
  +         junit.jvm.options=${junit.jvm.options}
  +         junit.formatter.usefile=${junit.formatter.usefile}
  +         ]]></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}">
  +            <formatter type="plain" usefile="false"/>
  +            <formatter
  +               classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
  +               usefile="${junit.formatter.usefile}"
  +               extension="${jboss-junit-configuration}.xml"/>
  +            <sysproperty key="build.testlog" value="${build.testlog}"/>
  +            <sysproperty key="build.resources" value="${build.resources}"/>
  +            <!-- definition of the property for keeping results between configuration -->
  +            <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
  +            <x-sysproperty/>
  +            <jvmarg value="${junit.jvm.options}"/>
  +            <x-test/>
  +            <classpath>
  +               <path refid="jboss.test.classpath"/>
  +               <x-classpath/>
  +            </classpath>
  +         </junit>
  +      </sequential>
  +   </macrodef>
  +
   <!-- ================================================================== -->
   <!-- Documents                                                          -->
   <!-- ================================================================== -->