Module Name: src Committed By: jmmv Date: Wed Jan 5 14:03:08 UTC 2011
Modified Files: src/external/bsd/atf/dist/atf-report: tests-results.xsl Log Message: Cherry-pick upstream revision f791048924a1b68da070f17dfd5e5c2d825dd018: Report bogus test programs in the HTML output >From Paul Goyette in private mail. Fixes PR bin/44301. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/atf/dist/atf-report/tests-results.xsl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/atf/dist/atf-report/tests-results.xsl diff -u src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.4 src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.5 --- src/external/bsd/atf/dist/atf-report/tests-results.xsl:1.4 Wed Oct 20 09:17:23 2010 +++ src/external/bsd/atf/dist/atf-report/tests-results.xsl Wed Jan 5 14:03:08 2011 @@ -86,6 +86,9 @@ <xsl:if test="$ntcs-skipped > 0"> <xsl:call-template name="skipped-tcs-summary" /> </xsl:if> + <xsl:if test="$ntps-failed > 0"> + <xsl:call-template name="failed-tps-summary" /> + </xsl:if> <xsl:call-template name="info-bottom" /> <xsl:apply-templates select="tp" mode="details" /> @@ -167,14 +170,16 @@ <td class="numeric"><p><xsl:value-of select="$ntps" /></p></td> </tr> <tr class="entry"> - <td><p>Bogus test programs</p></td> <xsl:choose> <xsl:when test="$ntps-failed > 0"> + <td><p><a href="#failed-tps-summary">Bogus test + programs</a></p></td> <td class="numeric-error"> <p><xsl:value-of select="$ntps-failed" /></p> </td> </xsl:when> <xsl:otherwise> + <td><p>Bogus test programs</p></td> <td class="numeric"> <p><xsl:value-of select="$ntps-failed" /></p> </td> @@ -314,6 +319,20 @@ </table> </xsl:template> + <xsl:template name="failed-tps-summary"> + <a name="failed-tps-summary" /> + <h2 id="failed-tps-summary">Bogus test programs summary</h2> + + <table class="tcs-summary"> + <tr> + <th>Test program</th> + </tr> + <xsl:apply-templates select="tp" mode="summary"> + <xsl:with-param name="which">bogus</xsl:with-param> + </xsl:apply-templates> + </table> + </xsl:template> + <xsl:template name="skipped-tcs-summary"> <a name="skipped-tcs-summary" /> <h2 id="skipped-tcs-summary">Skipped test cases summary</h2> @@ -335,6 +354,7 @@ <xsl:variable name="chosen"> <xsl:choose> + <xsl:when test="$which = 'bogus' and failed">yes</xsl:when> <xsl:when test="$which = 'passed' and tc/passed">yes</xsl:when> <xsl:when test="$which = 'failed' and tc/failed">yes</xsl:when> <xsl:when test="$which = 'xfail' and @@ -359,9 +379,11 @@ <p><xsl:value-of select="@id" /></p> </td> </tr> - <xsl:apply-templates select="tc" mode="summary"> - <xsl:with-param name="which" select="$which" /> - </xsl:apply-templates> + <xsl:if test="$which != 'bogus'"> + <xsl:apply-templates select="tc" mode="summary"> + <xsl:with-param name="which" select="$which" /> + </xsl:apply-templates> + </xsl:if> </xsl:if> </xsl:template>