Ver Fonte

report fixes

[SVN r23224]
Aleksey Gurtovoy há 22 anos atrás
pai
commit
29914d729f

+ 2 - 2
tools/regression/xsl_reports/xsl/html/issues_legend.html

@@ -15,7 +15,7 @@
         <tr>
             <td>
                 <table width="100%" summary="unexpected new fail legend">
-                <tr class="library-row-single"><td class="library-fail-unexpected-new">fail</td></tr>
+                <tr class="library-row-single"><td class="library-fail-unexpected-new">&lt;toolset&gt;</td></tr>
                 </table>
             </td>
             <td class="legend-item">Failure on a newly added test/compiler.</td>
@@ -23,7 +23,7 @@
         <tr>
             <td>
                 <table width="100%" summary="unexpected fail legend">
-                <tr class="library-row-single"><td class="library-fail-unexpected">fail</td></tr>
+                <tr class="library-row-single"><td class="library-fail-unexpected">&lt;toolset&gt;</td></tr>
                 </table>
             </td>
             <td class="legend-item">Unexpected failure.</td>

+ 29 - 0
tools/regression/xsl_reports/xsl/html/master.css

@@ -479,3 +479,32 @@ div.log-run-output-title
 {
   font-weight: bold;
 }
+
+
+/* Issues page */
+
+table.library-issues-table
+{
+    border-collapse: collapse;
+    border: 2px solid black;
+}
+
+table.library-issues-table td
+{
+    border: 1px solid #c0c0c0;
+    text-align: center;
+    margin-right: 5px;
+}
+
+table.library-issues-table td.failures-row
+{
+    text-align: left;
+    padding: 0px;
+}
+
+ table.issue-box tr.library-row-single td.library-fail-unexpected-new
+,table.issue-box tr.library-row-single td.library-fail-unexpected
+{
+    border: 0px;
+    font-weight: normal;
+}

+ 41 - 31
tools/regression/xsl_reports/xsl/issues_page.xsl

@@ -88,7 +88,7 @@
             <link rel="stylesheet" type="text/css" href="../master.css" title="master" />
             <title>Boost regression unresolved issues: <xsl:value-of select="$source"/></title>
         </head>
-        <frameset cols="170px,*" frameborder="0" framespacing="0" border="0">
+        <frameset cols="190px,*" frameborder="0" framespacing="0" border="0">
         <frame name="tocframe" src="toc.html" scrolling="auto"/>
         <frame name="docframe" src="{$issues_list}" scrolling="auto"/>
         </frameset>
@@ -126,24 +126,31 @@
                 <xsl:for-each select="$libraries">
                     <xsl:sort select="." order="ascending"/>
                     <xsl:variable name="library" select="."/>
+                    <xsl:variable name="library_page" select="meta:encode_path( $library )" />
                 
                     <xsl:variable name="library_tests" select="meta:get_library_tests( $unexpected_test_cases, $library )"/>
                     <xsl:if test="count( $library_tests ) > 0">
                         <xsl:variable name="library_test_names" select="set:distinct( $library_tests/@test-name )"/>
 
                         <h2>
-                            <a class="hover-link" href="{$library}.html" target="_top">
+                            <a class="hover-link" href="{$library_page}.html" target="_top">
                                 <xsl:value-of select="$library"/>
                             </a>
                         </h2>
                         
-                        <table border="0" cellspacing="0" cellpadding="0" class="library-table" summary="issues">
+                        <table class="library-issues-table" summary="issues">
                             <thead>
                                 <tr valign="middle">
                                     <td class="head">test</td>
                                     <td class="head">failures</td>
                                 </tr>
                             </thead>
+                            <tfoot>
+                                <tr valign="middle">
+                                    <td class="head">test</td>
+                                    <td class="head">failures</td>
+                                </tr>
+                            </tfoot>
 
                             <tbody>
                             <xsl:for-each select="$library_test_names">
@@ -160,34 +167,37 @@
                                                 <xsl:value-of select="$test_name"/>
                                             </a>
                                         </td>
-                                        <td>
-                                            <xsl:for-each select="$unexpected_toolsets">
-                                                <xsl:sort select="." order="ascending"/>
-                                                <xsl:variable name="toolset" select="."/>
-                                                <xsl:variable name="test_result" select="$library_tests[@test-name = $test_name and @toolset = $toolset]"/>
-                                                <xsl:variable name="log_link" select="meta:output_file_path( $test_result/@target-directory )"/>
-                                                <xsl:variable name="class">
-                                                    <xsl:choose>
-                                                        <xsl:when test="$test_result/@is-new = 'yes'">
-                                                            <xsl:text>library-fail-unexpected-new</xsl:text>
-                                                        </xsl:when>
-                                                        <xsl:otherwise>
-                                                            <xsl:text>library-fail-unexpected</xsl:text>
-                                                        </xsl:otherwise>
-                                                    </xsl:choose>
-                                                </xsl:variable>
-
-                                                <table summary="unexpected fail legend">
-                                                    <tr class="library-row-single">
-                                                        <td class="library-fail-unexpected">
-                                                            <a href="{$log_link}" class="log-link" target="_top">
-                                                                <xsl:value-of select="."/>
-                                                            </a>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-
-                                            </xsl:for-each>
+                                        <td class="failures-row">
+                                            <table summary="unexpected fail legend" class="issue-box">
+                                                <tr class="library-row-single">
+                                                
+                                                <xsl:for-each select="$unexpected_toolsets">
+                                                    <xsl:sort select="." order="ascending"/>
+                                                    <xsl:variable name="toolset" select="."/>
+                                                    <xsl:variable name="test_result" select="$library_tests[@test-name = $test_name and @toolset = $toolset]"/>
+                                                    <xsl:variable name="log_link" select="meta:output_file_path( $test_result/@target-directory )"/>
+                                                    <xsl:variable name="class">
+                                                        <xsl:choose>
+                                                            <xsl:when test="$test_result/@is-new = 'yes'">
+                                                                <xsl:text>library-fail-unexpected-new</xsl:text>
+                                                            </xsl:when>
+                                                            <xsl:otherwise>
+                                                                <xsl:text>library-fail-unexpected</xsl:text>
+                                                            </xsl:otherwise>
+                                                        </xsl:choose>
+                                                    </xsl:variable>
+
+                                                    <td class="{$class}">
+                                                        <span>
+                                                        <a href="{$log_link}" class="log-link" target="_top">
+                                                            <xsl:value-of select="."/>
+                                                        </a>
+                                                        </span>
+                                                    </td>
+                                                </xsl:for-each>
+                                                
+                                                </tr>
+                                            </table>
                                         </td>
                                     </tr>
                                 </xsl:if>

+ 7 - 6
tools/regression/xsl_reports/xsl/result_page.xsl

@@ -150,7 +150,7 @@
             <link rel="stylesheet" type="text/css" href="../master.css" title="master" />
             <title>Boost regression: <xsl:value-of select="$source"/></title>
         </head>
-        <frameset cols="170px,*" frameborder="0" framespacing="0" border="0">
+        <frameset cols="190px,*" frameborder="0" framespacing="0" border="0">
             <frame name="tocframe" src="toc.html" scrolling="auto"/>
             <frame name="docframe" src="{$index_path}" scrolling="auto"/>
         </frameset>
@@ -245,8 +245,9 @@
                   
                 <xsl:for-each select="$libraries">
                     <xsl:sort select="." order="ascending" />
+                    <xsl:variable name="library_page" select="meta:encode_path(.)" />
                     <div class="toc-entry">
-                        <a href="{.}.html" class="toc-entry" target="_top">
+                        <a href="{$library_page}.html" class="toc-entry" target="_top">
                             <xsl:value-of select="."/>
                         </a>
                     </div>
@@ -262,8 +263,8 @@
             <xsl:sort select="." order="ascending" />
             <xsl:variable name="library" select="." />
             
-            <xsl:variable name="library_results" select="concat( $library, '_.html' )"/>
-            <xsl:variable name="library_page" select="concat( $library, '.html' )"/>
+            <xsl:variable name="library_results" select="concat( meta:encode_path( $library ), '_.html' )"/>
+            <xsl:variable name="library_page" select="concat( meta:encode_path( $library ), '.html' )"/>
 
             <!-- Library page -->
             <xsl:message>Writing document <xsl:value-of select="$library_page"/></xsl:message>
@@ -279,7 +280,7 @@
                     <link rel="stylesheet" type="text/css" href="../master.css" title="master" />
                     <title>Boost regression: <xsl:value-of select="$library"/>/<xsl:value-of select="$source"/></title>
                 </head>
-                <frameset cols="170px,*" frameborder="0" framespacing="0" border="0">
+                <frameset cols="190px,*" frameborder="0" framespacing="0" border="0">
                 <frame name="tocframe" src="toc.html" scrolling="auto"/>
                 <frame name="docframe" src="{$library_results}" scrolling="auto"/>
                 </frameset>
@@ -564,7 +565,7 @@
                     <link rel="stylesheet" type="text/css" href="../master.css" title="master" />
                     <!--<title>Boost regression unresolved issues: <xsl:value-of select="$source"/></title>-->
                 </head>
-                <frameset cols="170px,*" frameborder="0" framespacing="0" border="0">
+                <frameset cols="190px,*" frameborder="0" framespacing="0" border="0">
                 <frame name="tocframe" src="../toc.html" scrolling="auto"/>
                 <frame name="docframe" src="../../{$log_file}" scrolling="auto"/>
                 </frameset>

+ 13 - 8
tools/regression/xsl_reports/xsl/summary_page.xsl

@@ -83,7 +83,7 @@
                 <link rel="stylesheet" type="text/css" href="../master.css" title="master" />
                 <title>Boost regression summary: <xsl:value-of select="$source"/></title>
             </head>
-            <frameset cols="170px,*" frameborder="0" framespacing="0" border="0">
+            <frameset cols="190px,*" frameborder="0" framespacing="0" border="0">
             <frame name="tocframe" src="toc.html" scrolling="auto"/>
             <frame name="docframe" src="{$summary_results}" scrolling="auto"/>
             </frameset>
@@ -135,12 +135,13 @@
                 <!-- for each library -->
                 <xsl:for-each select="$sorted_libraries">
                 <xsl:variable name="library" select="."/>
+                <xsl:variable name="library_page" select="meta:encode_path( $library )" />
                 <xsl:variable name="current_row" select="$test_logs[ @library=$library]"/>
 
                 <xsl:variable name="expected_test_count" select="count( $current_row[ generate-id(.) = generate-id( key('test_name_key',@test-name)[1] ) ] )"/>
                 <xsl:variable name="library_header">
                     <td class="library-name">
-                    <a href="{.}.html" class="library-link" target="_top">
+                    <a href="{$library_page}.html" class="library-link" target="_top">
                         <xsl:value-of select="$library"/>
                     </a>
                     </td>
@@ -237,10 +238,12 @@
         </xsl:choose>
     </xsl:variable>
       
+    <xsl:variable name="library_page" select="meta:encode_path( $library )" />
+
     <td class="{$class}">
         <xsl:choose>
         <xsl:when test="$class='summary-unusable'">
-            <a href="{$library}.html" class="log-link" target="_top">
+            <a href="{$library_page}.html" class="log-link" target="_top">
             <xsl:text>n/a</xsl:text>
             </a>          
         </xsl:when>
@@ -248,12 +251,12 @@
             <xsl:text>missing</xsl:text>
         </xsl:when>
         <xsl:when test="$class='summary-fail-unexpected'">
-            <a href="{$library}.html" class="log-link" target="_top">
+            <a href="{$library_page}.html" class="log-link" target="_top">
             <xsl:text>broken</xsl:text>
             </a>
         </xsl:when>
         <xsl:when test="$class='summary-fail-unexpected-new' ">
-            <a href="{$library}.html" class="log-link" target="_top">
+            <a href="{$library_page}.html" class="log-link" target="_top">
             <xsl:text>fail</xsl:text>
             </a>
         </xsl:when>
@@ -299,10 +302,12 @@
         </xsl:choose>
     </xsl:variable>
       
+    <xsl:variable name="library_page" select="meta:encode_path( $library )" />
+    
     <td class="{$class}">
         <xsl:choose>
         <xsl:when test="$class='summary-unusable'">
-            <a href="{$library}.html" class="log-link" target="_top">
+            <a href="{$library_page}.html" class="log-link" target="_top">
             <xsl:text>unusable</xsl:text>
             </a>          
         </xsl:when>
@@ -312,13 +317,13 @@
         </xsl:when>
 
         <xsl:when test="$class='summary-user-fail-unexpected'">
-            <a href="{$library}.html" class="log-link" target="_top">
+            <a href="{$library_page}.html" class="log-link" target="_top">
             <xsl:text>unexp.</xsl:text>
             </a>
         </xsl:when>
 
         <xsl:when test="$class='summary-user-fail-expected'">
-            <a href="{$library}.html" class="log-link" target="_top">
+            <a href="{$library_page}.html" class="log-link" target="_top">
             <xsl:text>details</xsl:text>
             </a>
         </xsl:when>

粤ICP备19079148号