incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1377614 - in /incubator/ooo/trunk/main/test: build.xml reportstyle/junit-frames.xsl
Date Mon, 27 Aug 2012 09:16:57 GMT
Author: liuzhe
Date: Mon Aug 27 09:16:56 2012
New Revision: 1377614

URL: http://svn.apache.org/viewvc?rev=1377614&view=rev
Log:
Let test report title show build revision and os name

Modified:
    incubator/ooo/trunk/main/test/build.xml
    incubator/ooo/trunk/main/test/reportstyle/junit-frames.xsl

Modified: incubator/ooo/trunk/main/test/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/build.xml?rev=1377614&r1=1377613&r2=1377614&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/build.xml (original)
+++ incubator/ooo/trunk/main/test/build.xml Mon Aug 27 09:16:56 2012
@@ -115,7 +115,7 @@
 	</target>
 
 	<target name="clean" description="Clean all output">
-		<delete dir="${out}" />
+		<delete dir="${env.INPATH}" />
 	</target>
 
 	<target name="check.junit">
@@ -245,13 +245,14 @@
 				<path refid="uno.classpath"/>
 			</classpath>
 		</junit>
-
+        <property file="${openoffice.home}/program/versionrc" prefix="openoffice"/>
+        <property file="${openoffice.home}/program/version.ini" prefix="openoffice"/>
 		<junitreport todir="${test.report}">
 			<fileset dir="${test.result}">
 				<include name="TEST-*.xml" />
 			</fileset>
 			<report format="frames" styledir="${junit.style.dir}" todir="${test.report}">
-				<param name="TITLE" expression="GUI Test Result" />
+				<param name="TITLE" expression="Test Build: AOO${openoffice.buildid}.r${openoffice.Revision},
OS: ${os.name}-${os.version}-${os.arch}"/>
 			</report>
 		</junitreport>
 		<property name="test.report.index" location="${test.report}/index.html" />

Modified: incubator/ooo/trunk/main/test/reportstyle/junit-frames.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/reportstyle/junit-frames.xsl?rev=1377614&r1=1377613&r2=1377614&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/reportstyle/junit-frames.xsl (original)
+++ incubator/ooo/trunk/main/test/reportstyle/junit-frames.xsl Mon Aug 27 09:16:56 2012
@@ -643,10 +643,6 @@ h6 {
                     </td>
                     <td><xsl:value-of select="$insamepackage/@timestamp"/></td>
                     <td><xsl:value-of select="$insamepackage/@hostname"/></td>
-
-					<!-- Added by VclAuto -->
-        <td><xsl:value-of select="properties/property[@name='version.buildid']/@value"/></td>
-        <td><xsl:value-of select="properties/property[@name='os.name']/@value"/>-<xsl:value-of
select="properties/property[@name='os.version']/@value"/>-<xsl:value-of select="properties/property[@name='os.arch']/@value"/></td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -737,9 +733,6 @@ h6 {
         <th nowrap="nowrap">Time(s)</th>
         <th nowrap="nowrap">Time Stamp</th>
         <th>Host</th>
-         <!-- Added by Vclauto -->
-        <th nowrap="nowrap">Product</th>
-        <th nowrap="nowrap">Env</th>
     </tr>
 </xsl:template>
 
@@ -754,7 +747,7 @@ h6 {
         <th>Status</th>
         <th width="80%">Type</th>
         <th nowrap="nowrap">Time(s)</th>
-        <!-- Added by Vclauto -->
+        <!-- Added by AOO -->
         <th>Screenshot</th>
         
     </tr>
@@ -799,9 +792,6 @@ h6 {
         </td>
         <td><xsl:apply-templates select="@timestamp"/></td>
         <td><xsl:apply-templates select="@hostname"/></td>
-        <!-- Added by VclAuto -->
-        <td><xsl:value-of select="properties/property[@name='version.buildid']/@value"/></td>
-        <td><xsl:value-of select="properties/property[@name='os.name']/@value"/>-<xsl:value-of
select="properties/property[@name='os.version']/@value"/>-<xsl:value-of select="properties/property[@name='os.arch']/@value"/></td>
     </tr>
 </xsl:template>
 
@@ -852,7 +842,7 @@ h6 {
             </xsl:call-template>
         </td>
 
-		<!-- Added by VclAuto -->
+		<!-- Added by AOO -->
 		<td>
 			<xsl:variable name="screenshot.dir">
 				<xsl:if test="not(boolean($show.class))">../../screenshot</xsl:if>



Mime
View raw message