Update of /cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27727
Modified Files:
Tag: RC_1_34_0
add_expected_results.xsl common.xsl
Log Message:
Better logic in is_test_log_completed
Index: add_expected_results.xsl
===================================================================
RCS file:
/cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl,v
retrieving revision 1.16.4.3
retrieving revision 1.16.4.4
diff -u -d -r1.16.4.3 -r1.16.4.4
--- add_expected_results.xsl 18 Jan 2007 01:21:14 -0000 1.16.4.3
+++ add_expected_results.xsl 29 Jan 2007 03:10:07 -0000 1.16.4.4
@@ -28,10 +28,26 @@
<func:function name="meta:is_test_log_complete">
<xsl:param name="test_log"/>
<xsl:variable name="type" select="$test_log/@test-type"/>
- <func:result select="( ( $type='compile' or $type='compile_fail' ) and
count( $test_log/compile ) > 0 )
- or ( ( $type='link' or $type='link_fail' ) and
count( $test_log/link ) > 0 )
- or ( count( $test_log/run ) > 0 )
- "/>
+ <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
$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' ">
+ <xsl:value-of select="count( $test_log/compile) = 1 and
count( $test_log/link) = 1 and count($test_log/run) = 1 "/>
+ </xsl:when>
+ <xsl:when test="$type=''"> <!-- library -->
+ <xsl:value-of select="count( $test_log/compile) = 1 and
count( $test_log/link) = 1"/>
+ </xsl:when>
+ <xsl:when test="$type=''"> <!-- library -->
+ <xsl:message terminate="yes">
+ Unknown test type "<xsl:value-of select="$type"/>
+ </xsl:message>
+ </xsl:when>
+ </xsl:choose>
+ </func:result>
</func:function>
Index: common.xsl
===================================================================
RCS file: /cvsroot/boost/boost/tools/regression/xsl_reports/xsl/v2/common.xsl,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -d -r1.37.2.1 -r1.37.2.2
--- common.xsl 17 Nov 2006 22:21:47 -0000 1.37.2.1
+++ common.xsl 29 Jan 2007 03:10:07 -0000 1.37.2.2
@@ -109,7 +109,7 @@
<func:function name="meta:test_case_status">
<xsl:param name="test_log"/>
- <xsl:param name="$explicit_markup"/>
+ <xsl:param name="explicit_markup"/>
<xsl:variable name="status">
<xsl:choose>
-------------------------------------------------------------------------
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
