Removed debug statements

[SVN r23877]

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

@@ -163,24 +163,6 @@ table.summary-table
     text-decoration: underline;
 }
 
-td.runner
-{
-    color: black;
-    font-weight: bold;
-    border-top: 1px solid black;
-    padding-left: 3pt;
-    padding-right: 3pt;
-
-}
-
-td.timestamp
-{
-    color: black;
-    border-bottom: 1px solid black;
-    padding-left: 3pt;
-    padding-right: 3pt;
-}
-
  td.toolset-name
 ,td.required-toolset-name
 {

tools/regression/xsl_reports/xsl/result_page.xsl

@@ -351,7 +351,6 @@
 
                         <xsl:variable name="lib_corner_case_tests" select="meta:order_tests_by_name( $lib_unique_test_names[ @test-name = $lib_corner_case_tests_markup/@name ] ) " />
 
-                        <xsl:copy-of select="$lib_corner_case_tests"/>
                         <!-- general tests section -->
 
                         <xsl:call-template name="insert_test_section">

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

@@ -59,15 +59,6 @@
          </xsl:choose>
       </xsl:variable>
 
-      <xsl:variable name="show_run_output">
-         <xsl:choose>
-            <xsl:when test="@show-run-output = 'true' ">
-                <xsl:text>yes</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>no</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
       <xsl:variable name="expected_result">
         <xsl:choose>
           <xsl:when test='count( $failures_markup ) &gt; 0'>
@@ -122,7 +113,6 @@
       <xsl:attribute name="expected-result"><xsl:value-of select="$expected_result"/></xsl:attribute>
       <xsl:attribute name="status"><xsl:value-of select="$status"/></xsl:attribute>
       <xsl:attribute name="is-new"><xsl:value-of select="$is_new"/></xsl:attribute>
-      <xsl:attribute name="show-run-output"><xsl:value-of select="$show_run_output"/></xsl:attribute>
       <!--<a><xsl:value-of select="count( $failures_markup )"/></a>-->
       <xsl:element name="notes"><xsl:copy-of select="$notes"/></xsl:element>
 

tools/regression/xsl_reports/xsl/v2/common.xsl

@@ -26,37 +26,43 @@
     <xsl:variable name="run_toolsets_f">
       <runs>
         <xsl:for-each select="$runs">
-            <run runner="{@runner}" timestamp="{@timestamp}" platform="{@platform}">
-            <comment><xsl:value-of select="comment"/></comment>
-            <xsl:variable name="not_ordered_toolsets" select="set:distinct( .//test-log[ meta:is_test_log_a_test_case(.) ]/@toolset )"/>
-
-            <xsl:variable name="not_ordered_toolsets_with_info_f">
-                <xsl:for-each select="$not_ordered_toolsets">
-                    <xsl:sort select="." order="ascending"/>
-                    <xsl:variable name="toolset" select="."/>
-                    <xsl:variable name="required">
-                        <xsl:choose>
-                            <xsl:when test="count( $required_toolsets[ @name = $toolset ] ) > 0">yes</xsl:when>
-                            <xsl:otherwise>no</xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:variable>
-                    <xsl:variable name="required_sort_hint">
-                        <xsl:choose>
-                            <xsl:when test="$required = 'yes'">sort hint A</xsl:when>
-                            <xsl:otherwise>sort hint B</xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:variable>
-                    <toolset name="{$toolset}" required="{$required}" required_sort_hint="{$required_sort_hint}"/>
+            <run 
+                runner="{@runner}" 
+                timestamp="{@timestamp}" 
+                platform="{@platform}"
+                run-type="{@run-type}"
+                source="{@source}">
+
+                <comment><xsl:value-of select="comment"/></comment>
+                <xsl:variable name="not_ordered_toolsets" select="set:distinct( .//test-log[ meta:is_test_log_a_test_case(.) ]/@toolset )"/>
+
+                <xsl:variable name="not_ordered_toolsets_with_info_f">
+                    <xsl:for-each select="$not_ordered_toolsets">
+                        <xsl:sort select="." order="ascending"/>
+                        <xsl:variable name="toolset" select="."/>
+                        <xsl:variable name="required">
+                            <xsl:choose>
+                                <xsl:when test="count( $required_toolsets[ @name = $toolset ] ) > 0">yes</xsl:when>
+                                <xsl:otherwise>no</xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:variable>
+                        <xsl:variable name="required_sort_hint">
+                            <xsl:choose>
+                                <xsl:when test="$required = 'yes'">sort hint A</xsl:when>
+                                <xsl:otherwise>sort hint B</xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:variable>
+                        <toolset name="{$toolset}" required="{$required}" required_sort_hint="{$required_sort_hint}"/>
+                    </xsl:for-each>
+                </xsl:variable>
+
+                <xsl:variable name="not_ordered_toolsets_with_info" select="exsl:node-set( $not_ordered_toolsets_with_info_f )"/>
+                
+                <xsl:for-each select="$not_ordered_toolsets_with_info/toolset">
+                    <xsl:sort select="concat( @required_sort_hint, '-', @name )" order="ascending"/>
+                    <xsl:copy-of select="."/>
                 </xsl:for-each>
-            </xsl:variable>
-
-            <xsl:variable name="not_ordered_toolsets_with_info" select="exsl:node-set( $not_ordered_toolsets_with_info_f )"/>
-
-            <xsl:for-each select="$not_ordered_toolsets_with_info/toolset">
-                <xsl:sort select="concat( @required_sort_hint, '-', @name )" order="ascending"/>
-                <xsl:copy-of select="."/>
-            </xsl:for-each>
-          </run>
+            </run>
         </xsl:for-each>
       </runs>
     </xsl:variable>
@@ -97,7 +103,7 @@
   <func:function name="meta:show_output">
       <xsl:param name="explicit_markup"/>     
       <xsl:param name="test_log"/>     
-      <func:result select="$test_log/@result != 'success' and not( meta:is_unusable( $explicit_markup, $test_log/@library, $test_log/@toolset )) or $test_log/@show-run-output = 'yes'"/>
+      <func:result select="$test_log/@result != 'success' and not( meta:is_unusable( $explicit_markup, $test_log/@library, $test_log/@toolset )) or $test_log/@show-run-output = 'true'"/>
   </func:function>
 
   <func:function name="meta:is_test_log_a_test_case">
@@ -141,7 +147,13 @@
       <tr>
           <td colspan="{$colspan}">&#160;</td>
           <xsl:for-each select="$run_toolsets/runs/run">
-              <td colspan="{count(toolset)}" class="runner"><a href="../{@runner}.html"><xsl:value-of select="@runner"/></a>&#160;(<xsl:value-of select="@platform"/>)</td>
+              <td colspan="{count(toolset)}" class="runner">
+                  <a href="../{@runner}.html">
+                      <xsl:value-of select="@runner"/>
+                  </a>
+                  <br/>
+                  <xsl:value-of select="concat( @platform, '/', @source, '/', @run-type )"/>
+              </td>
           </xsl:for-each>
       </tr>
 

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

@@ -163,6 +163,24 @@ table.summary-table
     text-decoration: underline;
 }
 
+td.runner
+{
+    color: black;
+    font-weight: bold;
+    border-top: 1px solid black;
+    padding-left: 3pt;
+    padding-right: 3pt;
+
+}
+
+td.timestamp
+{
+    color: black;
+    border-bottom: 1px solid black;
+    padding-left: 3pt;
+    padding-right: 3pt;
+}
+
  td.toolset-name
 ,td.required-toolset-name
 {
@@ -284,7 +302,7 @@ td.summary-unknown-status
     text-align: center;
     background-color: white;
     color: black;
-    border: 2px solid black; 
+    border: 1px solid black; 
     padding-left: 2pt;
     padding-right: 2pt;
 }

tools/regression/xsl_reports/xsl/v2/links_page.xsl

@@ -48,7 +48,7 @@
             <xsl:choose>
                 <xsl:when test="@test-name != ''">
                 <div class="log-test-title">
-                    <xsl:value-of select="concat( @library, ' - ', @test-name, ' / ', @toolset )"/>
+                    <xsl:value-of select="concat( ../@runner, ' - ', @library, ' - ', @test-name, ' / ', @toolset )"/>
                 </div>
                 </xsl:when>
                 <xsl:otherwise>

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

@@ -13,9 +13,11 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
     xmlns:exsl="http://exslt.org/common"
     xmlns:func="http://exslt.org/functions"
+    xmlns:str="http://exslt.org/strings"
     xmlns:set="http://exslt.org/sets"
     xmlns:meta="http://www.meta-comm.com"
     extension-element-prefixes="func exsl"
+    exclude-result-prefixes="set str meta"
     version="1.0">
 
     <xsl:import href="common.xsl"/>
@@ -382,6 +384,24 @@
     </xsl:template>
       
 
+    <!-- insert test result with log file link -->
+
+    <xsl:template name="insert_test_result">
+        <xsl:param name="result"/>
+        <xsl:param name="log_link"/>
+
+        <xsl:choose>
+            <xsl:when test="$log_link != ''">
+                <a href="{$log_link}" class="log-link" target="_top">
+                    <xsl:value-of select="$result"/>
+                </a>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$result"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
     <!-- report developer status -->
     <xsl:template name="insert_cell_developer">
         <xsl:param name="test_log"/>
@@ -396,13 +416,13 @@
         <xsl:variable name="class">
         <xsl:choose>
             <xsl:when test="not( $test_log )">
-            <xsl:text>library-missing</xsl:text>
+                <xsl:text>library-missing</xsl:text>
             </xsl:when>
             <xsl:when test="meta:is_unusable( $explicit_markup, $test_log/@library, $test_log/@toolset )">
-            <xsl:text>library-unusable</xsl:text>
+                <xsl:text>library-unusable</xsl:text>
             </xsl:when>
             <xsl:otherwise>
-            <xsl:value-of select="concat( 'library-', $test_log/@result, '-', $test_log/@status, $is_new )"/>
+                <xsl:value-of select="concat( 'library-', $test_log/@result, '-', $test_log/@status, $is_new )"/>
             </xsl:otherwise>
         </xsl:choose>
         </xsl:variable>
@@ -410,37 +430,35 @@
         <td class="{$class}">
         <xsl:choose>
             <xsl:when test="not( $test_log )">
-            <xsl:text>missing</xsl:text>
+                <xsl:text/>
             </xsl:when> 
+ 
             <xsl:when test="$test_log/@result != 'success' and $test_log/@status = 'expected'">
-                <xsl:choose>
-                    <xsl:when test="$log_link != ''">
-                        <a href="{$log_link}" class="log-link" target="_top">
-                            fail
-                        </a>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        fail
-                    </xsl:otherwise>
-                </xsl:choose>
+                    <xsl:call-template name="insert_test_result">
+                        <xsl:with-param name="result" select="'fail'"/>
+                        <xsl:with-param name="log_link" select="$log_link"/>
+                    </xsl:call-template>
             </xsl:when>
+
             <xsl:when test="$test_log/@result != 'success' and $test_log/@status = 'unexpected'">
-                <xsl:choose>
-                    <xsl:when test="$log_link != ''">
-                        <a href="{$log_link}" class="log-link" target="_top">
-                            fail
-                        </a>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        fail
-                    </xsl:otherwise>
-                </xsl:choose>
+                    <xsl:call-template name="insert_test_result">
+                        <xsl:with-param name="result" select="'fail'"/>
+                        <xsl:with-param name="log_link" select="$log_link"/>
+                    </xsl:call-template>
             </xsl:when>
+
             <xsl:when test="$test_log/@result = 'success' and $test_log/@status = 'unexpected'">
-                pass
+                    <xsl:call-template name="insert_test_result">
+                        <xsl:with-param name="result" select="'pass'"/>
+                        <xsl:with-param name="log_link" select="$log_link"/>
+                    </xsl:call-template>
             </xsl:when>
+
             <xsl:otherwise>
-            <xsl:text>pass</xsl:text>
+                    <xsl:call-template name="insert_test_result">
+                        <xsl:with-param name="result" select="'pass'"/>
+                        <xsl:with-param name="log_link" select="$log_link"/>
+                    </xsl:call-template>
             </xsl:otherwise>
         </xsl:choose>  
         <xsl:if test="count( $test_log ) > 1" > 

tools/regression/xsl_reports/xsl/v2/runners.xsl

@@ -32,7 +32,7 @@
               <body>
                 <h1><xsl:value-of select="@runner"/></h1>
                 <hr></hr>
-                <xsl:copy-of select="exsl:node-set( comment/text() )"/>
+                <xsl:value-of select="comment/text()" disable-output-escaping="yes"/>
               </body>
             </html>
           </exsl:document>
@@ -40,4 +40,6 @@
       </tr>
     </table>    
   </xsl:template>
+
 </xsl:stylesheet>
+

tools/regression/xsl_reports/xsl/v2/summary_page.xsl

@@ -168,10 +168,6 @@
                         <xsl:variable name="toolset" select="@name" />
                         <xsl:variable name="runner" select="../@runner" />
 
-                        <xsl:message>
-                            <xsl:value-of select="$runner"/>
-                        </xsl:message>
-
                         <xsl:variable name="current_cell" select="$current_row[ @toolset=$toolset and ../@runner = $runner ]"/>
 
                         <xsl:choose>