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

[Julien Viet]

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

  Modified:    security  build.xml
  Log:
  - extracted common stuff to run tests into a macro available in all modules
  
  Revision  Changes    Path
  1.20      +10 -72    jboss-portal/security/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/security/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- build.xml	28 Jun 2006 20:08:32 -0000	1.19
  +++ build.xml	16 Jul 2006 22:51:01 -0000	1.20
  @@ -8,7 +8,7 @@
     <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
   ]>
   
  -<!-- $Id: build.xml,v 1.19 2006/06/28 20:08:32 rgenova Exp $ -->
  +<!-- $Id: build.xml,v 1.20 2006/07/16 22:51:01 julien Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -182,81 +182,19 @@
   
      <target name="test" depends="init,compile">
          <ant antfile="imports/test-jars.xml" target="build-jars" />
  -
         <property name="build.testlog" value="${module.output}/log"/>
         <property name="include.wildcard" value="org/jboss/portal/test/security/**/*TestCase.class"/>
  -
  -      <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}
  -      ]]></echo>
  -
  -      <mkdir dir="${build.reports}"/>
  -	   <mkdir dir="${build.reports}/xml"/>
  -      <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}"
  -         showOutput="yes">
  -
  -         <formatter type="plain" usefile="false"/>
  -         <formatter type="xml" usefile="true"/>
  -         <sysproperty key="build.testlog" value="${build.testlog}"/>
  -         <sysproperty key="build.resources" value="${build.resources}"/>
  -         <!--<jvmarg value="${junit.jvm.options}"/>-->
  -         <!--<jvmarg value="-Xdebug"/>-->
  -         <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
  -         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  -         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  -
  +      <execute-tests>
  +         <x-test>
            <test name="org.jboss.portal.test.security.SimpleTestCase"/>
            <test name="org.jboss.portal.test.security.ComplexTestCase"/>
  -
  -
  -         <classpath>
  +         </x-test>
  +         <x-classpath>
               <pathelement location="${build.classes}"/>
               <pathelement location="${build.resources}"/>
               <path refid="library.classpath"/>
               <path refid="dependentmodule.classpath"/>
  -         </classpath>
  -         <formatter type="plain" usefile="true" />
  -         <formatter type="xml" usefile="true" />
  -<!--
  -         <batchtest todir="${build.reports}/xml" fork="true">
  -             <fileset dir="${build.classes}">
  -                     <include name="${include.wildcard}" />
  -                     <exclude name="${exclude.wildcard}" />
  -             </fileset>
  -         </batchtest>
  --->
  -      </junit>
  -
  -   </target>
  -
  -   	<!-- ================================================================== -->
  -	<!-- Reporting                                                          -->
  -	<!-- ================================================================== -->
  -
  -	<!-- Build the tests report -->
  -    <target name="tests-report" depends="init" description="Build the tests report">
  -        <junitreport todir="${build.reports}">
  -            <fileset dir="${build.reports}/xml">
  -               <include name="TEST-*.xml"/>
  -            </fileset>
  -            <report format="frames" todir="${build.reports}/html"/>
  -        </junitreport>
  +         </x-classpath>
  +      </execute-tests>
       </target> 
   </project>