brekke      02/03/13 20:42:03

  Modified:    src/templates/build build-docs.xml build-test.xml
  Log:
  * Split out the junit-report and dvsl tasks from the regular testing target.
    This new target will be called from the build-docs.xml.  This is similar
    to the way the metrics reports are rendered.  Only generate the xdoc when
    the docs are generated, not each time the tests are run.
  
  * Added another formatter to the junit task so there are text files along
    side the xml files needed for the xdoc/html generation.
  
  Revision  Changes    Path
  1.25      +7 -1      jakarta-turbine-maven/src/templates/build/build-docs.xml
  
  Index: build-docs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build-docs.xml    5 Mar 2002 16:27:18 -0000       1.24
  +++ build-docs.xml    14 Mar 2002 04:42:03 -0000      1.25
  @@ -6,7 +6,7 @@
   
     <target
       name="docs"
  -    depends="init, jdepend-metrics, cvs-change-log, generate-xdocs, docs:site"
  +    depends="init, jdepend-metrics, junit-report, cvs-change-log, generate-xdocs, 
docs:site"
       description="o Generate html project documentation xdoc sources">
     </target>
   
  @@ -14,6 +14,12 @@
       name="jdepend-metrics"
       description="o Generiates html from jdepend metrics">
       <ant antfile="$mavenDirectory/build-metrics.xml" target="jdepend-xml"/>
  +  </target>
  +
  +  <target 
  +    name="junit-report"
  +    description="o Generiates xdoc from junit test case runs">
  +    <ant antfile="$mavenDirectory/build-test.xml" target="junit-xml"/>
     </target>
   
     <!-- ================================================================== -->
  
  
  
  1.11      +19 -9     jakarta-turbine-maven/src/templates/build/build-test.xml
  
  Index: build-test.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-test.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build-test.xml    9 Mar 2002 15:55:46 -0000       1.10
  +++ build-test.xml    14 Mar 2002 04:42:03 -0000      1.11
  @@ -53,15 +53,6 @@
       name="run-tests" 
       depends="compile">
       
  -    <taskdef 
  -      name="dvsl" 
  -      classname="org.apache.tools.dvsl.DVSLTask">
  -
  -      <classpath>
  -        <path refid="classpath"/>
  -      </classpath>
  -    </taskdef>
  -
       <echo>
         Running all JUnit tests
       </echo>
  @@ -72,6 +63,7 @@
       <junit printSummary="yes" failureProperty="test.failure">
         <sysproperty key="basedir" value="${basedir}"/>
         <formatter type="xml"/>
  +      <formatter type="plain"/>
         <classpath>
           <path refid="classpath"/>
           <pathelement location="${build.dest}"/>
  @@ -82,6 +74,24 @@
           </fileset>
         </batchtest>
       </junit>
  +  </target>
  +
  +<!-- ================================================================== -->
  +<!-- C R E A T E  J U N I T  X M L  R E P O R T                         -->
  +<!-- ================================================================== -->
  +
  +  <target
  +    name="junit-xml"
  +    depends="run-tests">
  +
  +    <taskdef 
  +      name="dvsl" 
  +      classname="org.apache.tools.dvsl.DVSLTask">
  +
  +      <classpath>
  +        <path refid="classpath"/>
  +      </classpath>
  +    </taskdef>
   
       <!-- Consolidate the reports into a single -->
       <junitreport todir="${test.reportsDirectory}">
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to