Oh alright, back to junitModule.xml - another shot in the dark at cruise control

diff --git a/build/release/build.xml b/build/release/build.xml
index eb41713b7caa1fbba291089634304a30b374fb94..38f4cabe07815307b871a72c8fbae318c2a90023 100644 (file)
--- a/build/release/build.xml
+++ b/build/release/build.xml
@@ -443,6 +443,31 @@
        </target>
 
        <target name="test-junit-modules" 
+               depends="init-variables,init-junitTests-available">
+               <antcall target="do-run-ant">
+                       <param name="run.ant.file" value="junitModules.xml"/>
+                       <param name="ant.target" value="test-all"/>
+                       <param name="ant.dir" 
+                               location="${aspectj.modules.dir}/tests"/>
+                       <param name="ant.output" 
+                               location="${aj.build.log.dir}/test-junitModules"/>
+               </antcall>
+               
+               <property file="${java.home.file}"/>
+               <property name="tjm.copy.todir"
+                       location="${aj.build.log.dir}/junitXmlOutput-${build.java.version}"/>
+               <mkdir dir="${tjm.copy.todir}"/>
+               <delete quiet="on">
+                       <fileset dir="${tjm.copy.todir}" includes="**/*"/>
+               </delete>
+               <property name="xmlSrcDir"
+                       location="${aspectj.tests.dir}/bin/junitXmlOutput"/>
+               <move todir="${tjm.copy.todir}" >
+                       <fileset dir="${xmlSrcDir}"     includes="**/*"/>
+               </move>
+       </target>
+
+    <target name="test-junit" 
                depends="init-variables">           
                
                <antcall target="do-run-ant">