youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

#49418: produce HTML output for stdout/stderr from <junitreport> to declare encoding. 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@954484 13f79535-47bb-0310-9956-ffa450edef68
master
Jesse N. Glick 15 years ago
parent
e3463c1ff4
commit
458b692409
4 changed files with 48 additions and 17 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      WHATSNEW
  2. +23
    -9
      src/etc/junit-frames-xalan1.xsl
  3. +21
    -7
      src/etc/junit-frames.xsl
  4. +1
    -1
      src/etc/junit-noframes.xsl

+ 3
- 0
WHATSNEW View File

@@ -57,6 +57,9 @@ Fixed bugs:
* <javac> failed for long command lines on OS/2. * <javac> failed for long command lines on OS/2.
Bugzilla Report 49425. Bugzilla Report 49425.


* <junitreport> did not handle encodings well for stdout/stderr.
Bugzilla Report 49418.

Other changes: Other changes:
-------------- --------------




+ 23
- 9
src/etc/junit-frames-xalan1.xsl View File

@@ -4,7 +4,7 @@
xmlns:redirect="org.apache.xalan.lib.Redirect" xmlns:redirect="org.apache.xalan.lib.Redirect"
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
extension-element-prefixes="redirect"> extension-element-prefixes="redirect">
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:output method="html" indent="yes" encoding="UTF-8"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/> <xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
@@ -97,14 +97,28 @@
<xsl:apply-templates select="." mode="class.details"/> <xsl:apply-templates select="." mode="class.details"/>
</redirect:write> </redirect:write>
<xsl:if test="string-length(./system-out)!=0"> <xsl:if test="string-length(./system-out)!=0">
<redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.txt">
<xsl:value-of select="./system-out" />
</redirect:write>
<redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.html">
<html>
<head>
<title>Standard Output from <xsl:value-of select="@name"/></title>
</head>
<body>
<pre><xsl:value-of select="./system-out"/></pre>
</body>
</html>
</redirect:write>
</xsl:if> </xsl:if>
<xsl:if test="string-length(./system-err)!=0"> <xsl:if test="string-length(./system-err)!=0">
<redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.txt">
<xsl:value-of select="./system-err" />
</redirect:write>
<redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.html">
<html>
<head>
<title>Standard Error from <xsl:value-of select="@name"/></title>
</head>
<body>
<pre><xsl:value-of select="./system-err"/></pre>
</body>
</html>
</redirect:write>
</xsl:if> </xsl:if>
</xsl:for-each> </xsl:for-each>
</xsl:template> </xsl:template>
@@ -264,7 +278,7 @@ h6 {
<xsl:if test="string-length(./system-out)!=0"> <xsl:if test="string-length(./system-out)!=0">
<div class="Properties"> <div class="Properties">
<a> <a>
<xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
<xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.html</xsl:attribute>
System.out &#187; System.out &#187;
</a> </a>
</div> </div>
@@ -272,7 +286,7 @@ h6 {
<xsl:if test="string-length(./system-err)!=0"> <xsl:if test="string-length(./system-err)!=0">
<div class="Properties"> <div class="Properties">
<a> <a>
<xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
<xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.html</xsl:attribute>
System.err &#187; System.err &#187;
</a> </a>
</div> </div>


+ 21
- 7
src/etc/junit-frames.xsl View File

@@ -4,7 +4,7 @@
xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:redirect="http://xml.apache.org/xalan/redirect"
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils" xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
extension-element-prefixes="redirect"> extension-element-prefixes="redirect">
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:output method="html" indent="yes" encoding="UTF-8"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/> <xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
@@ -117,13 +117,27 @@
<xsl:apply-templates select="." mode="class.details"/> <xsl:apply-templates select="." mode="class.details"/>
</redirect:write> </redirect:write>
<xsl:if test="string-length(./system-out)!=0"> <xsl:if test="string-length(./system-out)!=0">
<redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.txt">
<xsl:value-of disable-output-escaping="yes" select="./system-out"/>
<redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.html">
<html>
<head>
<title>Standard Output from <xsl:value-of select="@name"/></title>
</head>
<body>
<pre><xsl:value-of select="./system-out"/></pre>
</body>
</html>
</redirect:write> </redirect:write>
</xsl:if> </xsl:if>
<xsl:if test="string-length(./system-err)!=0"> <xsl:if test="string-length(./system-err)!=0">
<redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.txt">
<xsl:value-of disable-output-escaping="yes" select="./system-err"/>
<redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.html">
<html>
<head>
<title>Standard Error from <xsl:value-of select="@name"/></title>
</head>
<body>
<pre><xsl:value-of select="./system-err"/></pre>
</body>
</html>
</redirect:write> </redirect:write>
</xsl:if> </xsl:if>
<xsl:if test="@failures != 0"> <xsl:if test="@failures != 0">
@@ -384,7 +398,7 @@ h6 {
<xsl:if test="string-length(./system-out)!=0"> <xsl:if test="string-length(./system-out)!=0">
<div class="Properties"> <div class="Properties">
<a> <a>
<xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
<xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.html</xsl:attribute>
System.out &#187; System.out &#187;
</a> </a>
</div> </div>
@@ -392,7 +406,7 @@ h6 {
<xsl:if test="string-length(./system-err)!=0"> <xsl:if test="string-length(./system-err)!=0">
<div class="Properties"> <div class="Properties">
<a> <a>
<xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
<xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.html</xsl:attribute>
System.err &#187; System.err &#187;
</a> </a>
</div> </div>


+ 1
- 1
src/etc/junit-noframes.xsl View File

@@ -2,7 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt" xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"> xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
<xsl:output method="html" indent="yes" encoding="US-ASCII"
<xsl:output method="html" indent="yes" encoding="UTF-8"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" /> doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<xsl:decimal-format decimal-separator="." grouping-separator="," /> <xsl:decimal-format decimal-separator="." grouping-separator="," />
<!-- <!--


Write Preview
Loading…
Cancel
Save