You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/04/10 00:01:11 UTC

cvs commit: jakarta-cactus/integration/ant build.xml

cmlenz      2003/04/09 15:01:09

  Modified:    integration/ant build.xml
  Log:
  - Generate JUnit-Reports
  - Change build order to run javadoc before the tests, so that the 
    compiled test classes don't get picked up by Javadoc (as seen in the
    Gump-generated docs)
  
  Revision  Changes    Path
  1.13      +15 -3     jakarta-cactus/integration/ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	3 Apr 2003 09:15:10 -0000	1.12
  +++ build.xml	9 Apr 2003 22:01:08 -0000	1.13
  @@ -56,8 +56,11 @@
   	        value="${target.classes.dir}/test"/>
   	    <property name="target.doc.dir" value="${target.dir}/doc"/>
   	    <property name="target.doc.api.dir" value="${target.doc.dir}/api"/>
  +	    <property name="target.doc.testreports.dir"
  +	        value="${target.doc.dir}/test-reports"/>
   
  -        <property name="target.integration.dir" value="${target.dir}/integration"/>
  +        <property name="target.integration.dir"
  +            value="${target.dir}/integration"/>
           <property name="target.integration.lib.dir" 
               value="${target.integration.dir}/lib"/>
   	    <property name="target.integration.lib.client.dir" 
  @@ -162,6 +165,8 @@
       <target name="test" depends="compile.test"
           description="Runs the unit tests">
   
  +        <mkdir dir="${target.doc.testreports.dir}"/>
  +
           <junit printsummary="yes" failureproperty="tests.failed" fork="yes">
   
               <classpath>
  @@ -171,15 +176,22 @@
   
               <formatter type="brief" usefile="false"/>
   
  -            <batchtest>
  +            <batchtest todir="${target.doc.testreports.dir}">
                   <fileset dir="${src.test.dir}">
                       <include name="**/Test*.java"/>
                       <exclude name="**/TestAll.java"/>
                   </fileset>
  +                <formatter type="xml"/>
               </batchtest>
   
           </junit>
   
  +        <junitreport todir="${target.doc.testreports.dir}">
  +          <fileset dir="${target.doc.testreports.dir}"
  +              includes="TEST-*.xml"/>
  +          <report format="frames" todir="${target.doc.testreports.dir}"/>
  +        </junitreport>
  +
           <fail if="tests.failed">At least one unit test failed!</fail>
   
       </target>
  @@ -262,7 +274,7 @@
            Generate the distributable files
          ========================================================================
       -->
  -    <target name="dist.prepare" depends="test,jar,doc,checkstyle">
  +    <target name="dist.prepare" depends="jar,doc,test,checkstyle">
   
           <mkdir dir="${target.integration.dir}"/>
           <mkdir dir="${target.integration.lib.client.dir}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org