Author: nickboldt Date: 2010-04-26 16:36:11 -0400 (Mon, 26 Apr 2010) New Revision: 21701 Modified: branches/modular_build/build/build.xml Log: after each component run, collect test results (so that if build is killed we still get partial results Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-04-26 20:28:43 UTC (rev 21700) +++ branches/modular_build/build/build.xml 2010-04-26 20:36:11 UTC (rev 21701) @@ -38,7 +38,7 @@ --> <target name="run" - depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build, collect.test.results" + depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build" /> <!-- override for local build --> @@ -302,16 +302,20 @@ <!-- <arg line="-o -Dmaven.test.skip" /> --> <arg line="${MAVEN_FLAGS} -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository clean install" /> </exec> + + <antcall target="collect.test.results"> + <param name="COMPONENT" value="${COMPONENT}" /> + </antcall> </sequential> </for> </target> <target name="collect.test.results"> - <!-- collect test results by copying ${WORKINGDIR}/**/target/surefire-reports/*.xml into ${basedir}/surefire-reports/ --> - <delete dir="${basedir}/surefire-reports/" includeemptydirs="true" /> - <mkdir dir="${basedir}/surefire-reports/" /> - <copy todir="${basedir}/surefire-reports/"> - <fileset dir="${WORKINGDIR}" includes="**/target/surefire-reports/*.xml" /> + <!-- collect test results by copying ${WORKINGDIR}/${COMPONENT}/**/target/surefire-reports/*.xml into ${basedir}/surefire-reports/${COMPONENT} --> + <delete dir="${basedir}/surefire-reports/${COMPONENT}" includeemptydirs="true" /> + <mkdir dir="${basedir}/surefire-reports/${COMPONENT}" /> + <copy todir="${basedir}/surefire-reports/${COMPONENT}"> + <fileset dir="${WORKINGDIR}/${COMPONENT}" includes="**/target/surefire-reports/*.xml" /> </copy> <!-- TODO parse test results files for output to dump into log :: look for lines with ERROR or FAILURE --> </target>