[Jython-checkins] SF.net SVN: jython:[5620] trunk/jython/build.xml

[<pj...@us...>]

Revision: 5620
          http://jython.svn.sourceforge.net/jython/?rev=5620&view=rev
Author:   pjenvey
Date:     2008-11-23 21:56:25 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
turn on javatest/regrtest junit xml output by default, to dist/testreports

Modified Paths:
--------------
    trunk/jython/build.xml

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-11-23 20:58:25 UTC (rev 5619)
+++ trunk/jython/build.xml	2008-11-23 21:56:25 UTC (rev 5620)
@@ -152,6 +152,7 @@
         <property name="gensrc.dir" value="${output.dir}/gensrc" />
         <property name="dist.dir" value="${work.dir}/dist" />
         <property name="apidoc.dir" value="${dist.dir}/Doc/javadoc" />
+        <property name="junit.reports" value="${dist.dir}/testreports" />
 
         <!-- classpaths -->
         <path id="main.classpath">
@@ -761,11 +762,17 @@
         </jar>
     </target>
 
-    <target name="test" depends="javatest,launchertest,regrtest"/>
+    <target name="test" depends="prepare-test,javatest,launchertest,regrtest"/>
+    <target name="prepare-test" depends="init">
+        <!-- Clean any old test output -->
+        <delete dir="${junit.reports}"/>
+    </target>
     <target name="javatest" depends="compile,expose">
+        <mkdir dir="${junit.reports}"/>
         <junit fork="true" printsummary="true">
+            <formatter type="xml"/>
             <classpath refid="test.classpath"/>
-            <batchtest todir="${dist.dir}/testreports">
+            <batchtest todir="${junit.reports}">
                 <fileset dir="${test.source.dir}" includes="**/*Test*.java">
                     <exclude name="javatests/**/*" />
                     <exclude name="**/InterpTestCase.java" />
@@ -787,6 +794,8 @@
         <arg value="${dist.dir}/Lib/test/regrtest.py"/>
         <!-- Only run the tests that are expected to work on Jython -->
         <arg value="--expected"/>
+        <arg value="-j"/>
+        <arg value="${junit.reports}"/>
       </exec>
     </target>
     <target name="regrtest-windows" if="os.family.windows">
@@ -795,6 +804,8 @@
         <arg value="${dist.dir}/Lib/test/regrtest.py"/>
         <!-- Only run the tests that are expected to work on Jython -->
         <arg value="--expected"/>
+        <arg value="-j"/>
+        <arg value="${junit.reports}"/>
       </exec>
     </target>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.