Update of /cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32023/xsl_reports/xsl/v2
Modified Files:
add_expected_results.xsl common.xsl links_page.xsl
summary_page.xsl
Added Files:
boostbook_log.xsl
Log Message:
Merge regression reports fixed from RC_1_34_0
Index: add_expected_results.xsl
===================================================================
RCS file:
/cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- add_expected_results.xsl 24 Jul 2006 01:48:26 -0000 1.17
+++ add_expected_results.xsl 20 Feb 2007 10:26:23 -0000 1.18
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright MetaCommunications, Inc. 2003-2006.
+Copyright MetaCommunications, Inc. 2003-2007.
Distributed under the Boost Software License, Version 1.0. (See
accompanying file LICENSE_1_0.txt or copy at
@@ -11,8 +11,10 @@
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:func="http://exslt.org/functions";
xmlns:meta="http://www.meta-comm.com";
- exclude-result-prefixes="meta"
+ extension-element-prefixes="func"
+ exclude-result-prefixes="func meta"
version="1.0">
<xsl:import href="common.xsl"/>
@@ -23,6 +25,29 @@
<xsl:param name="failures_markup_file"/>
<xsl:variable name="expected_results" select="document(
$expected_results_file )" />
+ <func:function name="meta:is_test_log_complete">
+ <xsl:param name="test_log"/>
+ <xsl:variable name="type" select="$test_log/@test-type"/>
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$type='compile' or $type='compile_fail' or
$test_log/compile/@result='fail' ">
+ <xsl:value-of select="count( $test_log/compile ) = 1 and
count( $test_log/link) = 0 and count( $test_log/run) = 0"/>
+ </xsl:when>
+ <xsl:when test="$type='link' or $type='link_fail' or $type=''
or $type='lib' or $test_log/link/@result='fail'">
+ <xsl:value-of select="count( $test_log/compile) = 1 and
count( $test_log/link) = 1 and count( $test_log/run) = 0"/></xsl:when>
+ <xsl:when test="$type='run' or $type='run_fail' or
$type='run_pyd'">
+ <xsl:value-of select="count( $test_log/compile) = 1 and
count( $test_log/link) = 1 and count($test_log/run) = 1 "/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ Unknown test type "<xsl:value-of select="$type"/>"
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
+ </func:function>
+
+
<xsl:key name = "trk" match = "test-result" use = "concat( ../../@name,
'-', ../@name, '-', @test-name )" />
<xsl:key name = "tak" match = "toolset-alias" use = "@name" />
@@ -37,23 +62,21 @@
<xsl:variable name="test-name" select="@test-name"/>
<xsl:variable name="toolset" select="@toolset"/>
+ <xsl:variable name="is_complete" select="meta:is_test_log_complete(
$test_log )"/>
+
<xsl:element name="{local-name()}">
<xsl:apply-templates select="@*"/>
-
+ <xsl:variable name="has_failures" select="./*/@result = 'fail'"/>
<xsl:variable name="actual_result">
<xsl:choose>
- <!-- Hack: needs to be researched (and removed). See
M.Wille's incident. -->
- <xsl:when test="run/@result='succeed' and
lib/@result='fail'">
- <xsl:text>success</xsl:text>
- </xsl:when>
- <xsl:when test="./*/@result = 'fail'" >
+ <xsl:when test="$has_failures or not( $is_complete )" >
<xsl:text>fail</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>success</xsl:text>
</xsl:otherwise>
- </xsl:choose>
+ </xsl:choose>
</xsl:variable>
<!--
@@ -206,9 +229,19 @@
</xsl:otherwise>
</xsl:choose>
</xsl:if>
+
+ <xsl:if test="not( $is_complete ) and not( $has_failures
)">
+ <note>
+ <span class="internal-error-note">
+ <b>[Reporting Tools Internal Error]</b> This
test case's XML is missing one or more log entries
+ of the regression run's steps associated with
the test case's type ("<xsl:value-of select="$test_log/@test-type"/>").
+ Please <a href="mailto:mailto:[EMAIL
PROTECTED]">contact reporting tools
+ maintainers</a> about this problem.
+ </span>
+ </note>
+ </xsl:if>
</xsl:variable>
-
<xsl:attribute name="result"><xsl:value-of
select="$actual_result"/></xsl:attribute>
<xsl:attribute name="expected-result"><xsl:value-of
select="$expected_result"/></xsl:attribute>
<xsl:attribute name="expected-reason"><xsl:value-of
select="$expected_reason"/></xsl:attribute>
Index: common.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2/common.xsl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- common.xsl 18 Nov 2006 15:12:40 -0000 1.38
+++ common.xsl 20 Feb 2007 10:26:23 -0000 1.39
@@ -108,8 +108,8 @@
<func:function name="meta:test_case_status">
+ <xsl:param name="explicit_markup"/>
<xsl:param name="test_log"/>
- <xsl:param name="$explicit_markup"/>
<xsl:variable name="status">
<xsl:choose>
Index: links_page.xsl
===================================================================
RCS file:
/cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2/links_page.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- links_page.xsl 11 Jun 2006 04:30:07 -0000 1.15
+++ links_page.xsl 20 Feb 2007 10:26:23 -0000 1.16
@@ -312,21 +312,21 @@
<xsl:if test="compile">
<p>
- <div class="log-compiler-output-title">Compiler
output [<xsl:value-of select="compile/@timestamp"/>]:</div>
+ <div class="log-compiler-output-title">Compile
[<xsl:value-of select="compile/@timestamp"/>]: <span
class="output-{compile/@result}"><xsl:value-of
select="compile/@result"/></span></div>
<pre><xsl:copy-of select="compile/node()"/></pre>
</p>
</xsl:if>
<xsl:if test="link">
<p>
- <div class="log-linker-output-title">Linker output
[<xsl:value-of select="link/@timestamp"/>]:</div>
+ <div class="log-linker-output-title">Link
[<xsl:value-of select="link/@timestamp"/>]: <span
class="output-{link/@result}"><xsl:value-of select="link/@result"/></span></div>
<pre><xsl:copy-of select="link/node()"/></pre>
</p>
</xsl:if>
<xsl:if test="lib">
<p>
- <div class="log-linker-output-title">Lib output
[<xsl:value-of select="lib/@timestamp"/>]:</div>
+ <div class="log-linker-output-title">Lib
[<xsl:value-of select="lib/@timestamp"/>]: <span
class="output-{lib/@result}"><xsl:value-of select="lib/@result"/></span></div>
<p>
See <a href="{meta:encode_path( concat(
$runner_id, '-', lib/node() ) ) }.html">
<xsl:copy-of select="lib/node()"/>
@@ -337,7 +337,7 @@
<xsl:if test="run">
<p>
- <div class="log-run-output-title">Run output
[<xsl:value-of select="run/@timestamp"/>]:</div>
+ <div class="log-run-output-title">Run
[<xsl:value-of select="run/@timestamp"/>]: <span
class="output-{run/@result}"><xsl:value-of select="run/@result"/></span></div>
<pre>
<xsl:copy-of select="run/node()"/>
</pre>
Index: summary_page.xsl
===================================================================
RCS file:
/cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2/summary_page.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- summary_page.xsl 2 Aug 2005 07:52:00 -0000 1.15
+++ summary_page.xsl 20 Feb 2007 10:26:23 -0000 1.16
@@ -147,11 +147,11 @@
</xsl:call-template>
<div class="statistics">
- Unusable: <xsl:value-of select="count( $test_case_logs[
meta:test_case_status( . ) = 'unusable' ] )"/>
+ Unusable: <xsl:value-of select="count( $test_case_logs[
meta:test_case_status( $explicit_markup, . ) = 'unusable' ] )"/>
 | 
- Regressions: <xsl:value-of select="count( $test_case_logs[
meta:test_case_status( . ) = 'fail-unexpected' ] )"/>
+ Regressions: <xsl:value-of select="count( $test_case_logs[
meta:test_case_status( $explicit_markup, . ) = 'fail-unexpected' ] )"/>
 | 
- New failures: <xsl:value-of select="count( $test_case_logs[
meta:test_case_status( . ) = 'fail-unexpected-new' ] )"/>
+ New failures: <xsl:value-of select="count( $test_case_logs[
meta:test_case_status( $explicit_markup, . ) = 'fail-unexpected-new' ] )"/>
</div>
<!-- summary table -->
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
