appearance tweaks

[SVN r25421]

tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl

@@ -65,7 +65,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
         <xsl:variable name="expected_result">
             <xsl:choose>
-            <xsl:when test='count( $test_failures_markup ) > 0 or count( $test_failures_markup2 ) > 0'>
+            <xsl:when test="count( $test_failures_markup ) > 0 or count( $test_failures_markup2 ) > 0">
                 <xsl:text>fail</xsl:text>
             </xsl:when>
               
@@ -102,19 +102,19 @@ http://www.boost.org/LICENSE_1_0.txt)
 
         <xsl:variable name="notes">
 
-            <xsl:if test='count( $test_failures_markup ) > 0'>
+            <xsl:if test="count( $test_failures_markup ) > 0">
                 <xsl:for-each select="$test_failures_markup/note">
                 <xsl:copy-of select="."/>
                 </xsl:for-each>
             </xsl:if>
 
-            <xsl:if test='count( $test_failures_markup2 ) > 0'>
+            <xsl:if test="count( $test_failures_markup2 ) > 0">
                 <xsl:for-each select="$test_failures_markup2/note">
                 <xsl:copy-of select="."/>
                 </xsl:for-each>
             </xsl:if>
               
-            <xsl:if test='$expected_results_test_case'>
+            <xsl:if test="$expected_results_test_case and $expected_results_test_case/@result = 'fail'">
                 <note>This failure was present in the reference ("last-known-good") release.
                 </note>
             </xsl:if>

tools/regression/xsl_reports/xsl/v2/html/library_developer_legend.html

@@ -32,10 +32,10 @@ http://www.boost.org/LICENSE_1_0.txt)
         <tr>
             <td>
                 <table width="100%" summary="expected fail legend">
-                <tr class="library-row-single"><td class="library-fail-expected">fail</td></tr>
+                <tr class="library-row-single"><td class="library-fail-expected">fail*</td></tr>
                 </table>
             </td>
-            <td class="legend-item">Expected failure.</td>
+            <td class="legend-item">Expected failure; follow the link to see the details.</td>
         </tr>
     </table>
     </td>
@@ -55,7 +55,7 @@ http://www.boost.org/LICENSE_1_0.txt)
                 <tr class="library-row-single"><td class="library-fail-unexpected">fail</td></tr>
                 </table>
             </td>
-            <td class="legend-item">Unexpected failure.</td>
+            <td class="legend-item">Unexpected failure/regression.</td>
         </tr>
         <tr>
             <td>

tools/regression/xsl_reports/xsl/v2/html/master.css

@@ -282,6 +282,18 @@ td.summary-unknown-status
     padding-right: 2pt;
 }
 
+  td.summary-unusable
+, td.library-unusable
+{
+    width: 60pt;  
+    text-align: center;
+    background-color: silver;
+    color: black;
+    border: 0px;
+    padding-left: 2pt;
+    padding-right: 2pt;
+}
+
 
  tr.summary-row         td.summary-fail-unexpected
 ,tr.summary-row-first   td.summary-fail-unexpected
@@ -307,47 +319,35 @@ td.summary-unknown-status
     padding-right: 2pt;
 }
 
-  tr.summary-row        td.summary-missing
-, tr.summary-row-first  td.summary-missing
-, tr.summary-row-last   td.summary-missing
-, tr.summary-row-single td.summary-missing
-
-, tr.library-row        td.library-missing
-, tr.library-row-first  td.library-missing
-, tr.library-row-last   td.library-missing
-, tr.library-row-single td.library-missing
+  td.summary-missing
+, td.library-missing
 {
     width: 60pt;
     text-align: center;
     background-color: white;
     color: black;
-    border: 1px solid black; 
+    border: 0px;
     padding-left: 2pt;
     padding-right: 2pt;
 }
 
-  tr.summary-row        td.summary-unusable
-, tr.summary-row-first  td.summary-unusable
-, tr.summary-row-last   td.summary-unusable
-, tr.summary-row-single td.summary-unusable
+  tr.summary-row-first  td.summary-missing
+, tr.summary-row-single td.summary-missing
+, tr.library-row-first  td.library-missing
+, tr.library-row-single td.library-missing
+{
+    border-top: 1px solid black;
+}
 
-, tr.library-row        td.library-unusable
-, tr.library-row-first  td.library-unusable
-, tr.library-row-last   td.library-unusable
-, tr.library-row-single td.library-unusable
+  tr.summary-row-last   td.summary-missing
+, tr.summary-row-single td.summary-missing
+, tr.library-row-last   td.library-missing
+, tr.library-row-single td.library-missing
 {
-    width: 60pt;  
-    text-align: center;
-    background-color: silver;
-    color: black;
-    border-top: 2px solid black; 
-    border-bottom: 2px solid black; 
-    border-left: 2px solid black; 
-    border-right: 2px solid black; 
-    padding-left: 2pt;
-    padding-right: 2pt;
+    border-bottom: 1px solid black;
 }
 
+
 /* Summary */
 
 table.summary-table td.library-name
@@ -464,7 +464,7 @@ td.library-user-fail-expectected
 table.library-library-notes
 {
     background-color: LemonChiffon;
-    width: 640px;
+    width: 80%;
     margin-left: 5px;
     margin-right: 5px; 
 }

tools/regression/xsl_reports/xsl/v2/result_page.xsl

@@ -293,7 +293,7 @@ http://www.boost.org/LICENSE_1_0.txt)
                 </div>
 
                 <!-- library marks = library-unusable markup for toolsets in the report  -->
-                <xsl:variable name="library_marks" select="$explicit_markup//library[ @name = $library ]/mark-unusable[  meta:re_match( toolset/@name, $run_toolsets//toolset/@name ) ]"/>
+                <xsl:variable name="library_marks" select="$explicit_markup//library[ @name = $library ]/mark-unusable/toolset[  meta:re_match( @name, $run_toolsets//toolset/@name ) ]/.."/>
                 <lmarks>
                     <xsl:copy-of select="$library_marks"/>
                 </lmarks>
@@ -436,13 +436,6 @@ http://www.boost.org/LICENSE_1_0.txt)
         <xsl:param name="toolset"/>
         <xsl:param name="test_log"/>
         
-        <xsl:variable name="is_new">
-            <xsl:if test="$test_log/@is-new = 'yes' and $test_log/@status = 'unexpected' and $test_log/@result != 'success'">
-                <xsl:value-of select="'-new'"/>
-            </xsl:if>
-        </xsl:variable>
-
-        
         <xsl:variable name="class" select="concat( 'library-', meta:result_cell_class( $library, $toolset, $test_log ) )"/>
 
         <xsl:variable name="cell_link">
@@ -514,36 +507,43 @@ http://www.boost.org/LICENSE_1_0.txt)
 
         <td class="{$class}" title="{$test_log/@test-name}/{$toolset}">
         <xsl:choose>
+             <xsl:when test="meta:is_unusable( $explicit_markup, $library, $toolset )">
+                <xsl:call-template name="insert_test_result">
+                    <xsl:with-param name="result" select="'n/a'"/>
+                    <xsl:with-param name="log_link" select="$cell_link"/>
+                </xsl:call-template>
+            </xsl:when> 
+
             <xsl:when test="count( $test_log ) &lt; 1">
                 <xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
             </xsl:when> 
  
             <xsl:when test="$test_log/@result != 'success' and $test_log/@status = 'expected'">
-                    <xsl:call-template name="insert_test_result">
-                        <xsl:with-param name="result" select="'fail'"/>
-                        <xsl:with-param name="log_link" select="$cell_link"/>
-                    </xsl:call-template>
+                <xsl:call-template name="insert_test_result">
+                    <xsl:with-param name="result" select="'fail*'"/>
+                    <xsl:with-param name="log_link" select="$cell_link"/>
+                </xsl:call-template>
             </xsl:when>
 
             <xsl:when test="$test_log/@result != 'success' and $test_log/@status = 'unexpected'">
-                    <xsl:call-template name="insert_test_result">
-                        <xsl:with-param name="result" select="'fail'"/>
-                        <xsl:with-param name="log_link" select="$cell_link"/>
-                    </xsl:call-template>
+                <xsl:call-template name="insert_test_result">
+                    <xsl:with-param name="result" select="'fail'"/>
+                    <xsl:with-param name="log_link" select="$cell_link"/>
+                </xsl:call-template>
             </xsl:when>
 
             <xsl:when test="$test_log/@result = 'success' and $test_log/@status = 'unexpected'">
-                    <xsl:call-template name="insert_test_result">
-                        <xsl:with-param name="result" select="'pass'"/>
-                        <xsl:with-param name="log_link" select="$cell_link"/>
-                    </xsl:call-template>
+                <xsl:call-template name="insert_test_result">
+                    <xsl:with-param name="result" select="'pass'"/>
+                    <xsl:with-param name="log_link" select="$cell_link"/>
+                </xsl:call-template>
             </xsl:when>
 
             <xsl:otherwise>
-                    <xsl:call-template name="insert_test_result">
-                        <xsl:with-param name="result" select="'pass'"/>
-                        <xsl:with-param name="log_link" select="$cell_link"/>
-                    </xsl:call-template>
+                <xsl:call-template name="insert_test_result">
+                    <xsl:with-param name="result" select="'pass'"/>
+                    <xsl:with-param name="log_link" select="$cell_link"/>
+                </xsl:call-template>
             </xsl:otherwise>
         </xsl:choose>  
         </td>