[jbosstools-commits] JBoss Tools SVN: r22027 - branches/modular_build/build.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2010-05-11 16:30:21 -0400 (Tue, 11 May 2010)
New Revision: 22027

Modified:
   branches/modular_build/build/build.xml
Log:
exclude non-test result files from report 

Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml	2010-05-11 20:19:13 UTC (rev 22026)
+++ branches/modular_build/build/build.xml	2010-05-11 20:30:21 UTC (rev 22027)
@@ -589,7 +589,7 @@
 						<echo>Run custom @{COMPONENT}/build.xml</echo>
 						<ant antfile="${WORKINGDIR}/@{COMPONENT}/build.xml">
 							<property name="COMPONENT" value="@{COMPONENT}" />
-							<property name="basedir" value="${WORKINGDIR}/@{COMPONENT}"/>
+							<property name="basedir" value="${WORKINGDIR}/@{COMPONENT}" />
 						</ant>
 					</then>
 				</if>
@@ -730,7 +730,7 @@
 		<for param="testresultfile" delimiter=", 
 		">
 			<path>
-				<fileset dir="${basedir}/surefire-reports/" includes="**/*.xml" />
+				<fileset dir="${basedir}/surefire-reports/" includes="**/TEST-*.xml" excludes="**/*pom.xml, **/build.xml"/>
 			</path>
 			<sequential>
 				<var name="testsuite.name" unset="true" />
@@ -784,9 +784,14 @@
 						/>
 					</then>
 				</if>
-				<var name="test.results.all"
-				     value="${test.results.all}${testsuite.name} ran ${testsuite.tests} tests in ${testsuite.time}s${testsuite.skipped}${testsuite.errors}${testsuite.failures}${line.separator}"
-				/>
+				<if>
+					<isset property="testsuite.name" />
+					<then>
+						<var name="test.results.all"
+						     value="${test.results.all}${testsuite.name} ran ${testsuite.tests} tests in ${testsuite.time}s${testsuite.skipped}${testsuite.errors}${testsuite.failures}${line.separator}"
+						/>
+					</then>
+				</if>
 				<var name="testsuite.name" unset="true" />
 				<var name="testsuite.tests" unset="true" />
 				<var name="testsuite.time" unset="true" />