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

[Julien Viet]

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

  Modified:    common   build.xml
  Log:
  - extracted common stuff to run tests into a macro available in all modules
  
  Revision  Changes    Path
  1.33      +23 -64    jboss-portal/common/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/common/build.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- build.xml	16 Jul 2006 13:09:58 -0000	1.32
  +++ build.xml	16 Jul 2006 22:51:01 -0000	1.33
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.32 2006/07/16 13:09:58 julien Exp $ -->
  +<!-- $Id: build.xml,v 1.33 2006/07/16 22:51:01 julien Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -70,7 +70,6 @@
            <path refid="apache.ant.classpath"/>
            <path refid="apache.log4j.classpath"/>
            <path refid="junit.junit.classpath"/>
  -         <path refid="jboss.test.classpath"/>
            <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/>
            <pathelement location="../tools/lib/cargo-ant-0.8.jar"/>
         </path>
  @@ -183,47 +182,8 @@
      <target name="help" depends="_default:help"/>
   
      <target name="test" depends="compile">
  -
  -      <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 value="-Xdebug"/>-->
  -         <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
  -
  -         <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}"/>
  -         <sysproperty key="build.lib" value="${build.lib}"/>
  -         
  -         <!-- 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"/>
  -
  +      <execute-tests>
  +         <x-test>
            <test name="org.jboss.portal.test.common.LocaleInfoTestCase"/>
            <test name="org.jboss.portal.test.common.ParentChildResourceBundleTestCase"/>
            <test name="org.jboss.portal.test.common.ValveTestCase"/>
  @@ -240,16 +200,15 @@
            <test name="org.jboss.portal.test.common.ParameterMapTestCase"/>
            <test name="org.jboss.portal.test.common.LocalizedStringTestCase"/>
            <test name="org.jboss.portal.test.common.ImplodeTestCase"/>
  -
  -         <classpath>
  +         </x-test>
  +         <x-classpath>
               <pathelement location="${build.classes}"/>
               <pathelement location="${build.resources}"/>
               <path refid="dom4j.dom4j.classpath"/>
               <path refid="library.classpath"/>
               <path refid="dependentmodule.classpath"/>
  -         </classpath>
  -      </junit>
  -
  +         </x-classpath>
  +      </execute-tests>
      </target>
   
   </project>