diff options
| author | Liu Zhe <liuzhe@apache.org> | 2012-08-27 08:16:56 +0000 |
|---|---|---|
| committer | Liu Zhe <liuzhe@apache.org> | 2012-08-27 08:16:56 +0000 |
| commit | cedc3d98f3e9d2e194fbd0ffc89aba7bb490eaec (patch) | |
| tree | 1bee36bdd6b9c853c70ed2366b20647936a974c0 /test | |
| parent | f40f1fd1bf82df8cd66c70aa97c76b5be94f8f6b (diff) | |
Let test report title show build revision and os name
Notes
Notes:
ignore: vclauto
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.xml | 7 | ||||
| -rw-r--r-- | test/reportstyle/junit-frames.xsl | 14 |
2 files changed, 6 insertions, 15 deletions
diff --git a/test/build.xml b/test/build.xml index 682e01e30d62..d726e11e5132 100644 --- a/test/build.xml +++ b/test/build.xml @@ -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" /> diff --git a/test/reportstyle/junit-frames.xsl b/test/reportstyle/junit-frames.xsl index f329848d85dc..23f81b7693c6 100644 --- a/test/reportstyle/junit-frames.xsl +++ b/test/reportstyle/junit-frames.xsl @@ -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> |