Merge report fixes from RC_1_34_0

[SVN r36075]

tools/regression/xsl_reports/test/generate_test_results.py

@@ -41,6 +41,11 @@ def test_run_type( runner_idx ):
     else:              return "full"
 
 
+def test_type( i ):
+    types = [ "compile", "compile_fail", "link", "link_fail", "run", "run_fail", "run_pyd" ]
+    return types[ i % len( types) ]
+
+
 def make_test_results():
     if not os.path.exists( results_directory ):
         os.makedirs( results_directory )
@@ -95,14 +100,13 @@ def make_test_results():
                 for i_test in range( num_of_tests ):
                     test_name = "test_%02d_%02d" % ( i_lib, i_test )
                     test_result = ""
-                    test_type = "run"
                     show_run_output = "false"
                     
                     if num_of_runners - 1 == i_runner and i_test % 2:
                         continue
                     
                     if i_runner % 2: test_result = "success"
-                    else:             test_result = "fail"
+                    else:            test_result = "fail"
 
                     if i_runner == 1 and i_toolset == 2 and i_test % 6 == 0:
                         test_result = "fail"
@@ -120,7 +124,7 @@ def make_test_results():
                                               , library_idx = i_lib
                                               , toolset_idx = i_toolset
                                               , test_name = test_name
-                                              , test_type = test_type
+                                              , test_type = test_type( i_test )
                                               , test_result = test_result
                                               , show_run_output = show_run_output
                                               , variant = variant )

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

@@ -147,8 +147,10 @@ http://www.boost.org/LICENSE_1_0.txt)
     </func:function>
 
     <func:function name="meta:is_test_log_a_test_case">
-        <xsl:param name="test_log"/>      
-        <func:result select="$test_log/@test-type='compile' or $test_log/@test-type='compile_fail' or $test_log/@test-type='run' or $test_log/@test-type='run_pyd'"/>
+        <xsl:param name="test_log"/>       
+        <xsl:variable name="type" select="$test_log/@test-type"/>
+        <func:result select="$type='compile' or $type='compile_fail' or $type='link' or $type='link_fail' 
+                             or $type='run' or $type='run_fail' or $type='run_pyd'"/>
     </func:function>
 
 

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

@@ -102,6 +102,8 @@ http://www.boost.org/LICENSE_1_0.txt)
             <xsl:when test="$test_type='run_fail'">     <xsl:text>rf</xsl:text> </xsl:when>
             <xsl:when test="$test_type='compile'">      <xsl:text>c</xsl:text>  </xsl:when>
             <xsl:when test="$test_type='compile_fail'"> <xsl:text>cf</xsl:text> </xsl:when>
+            <xsl:when test="$test_type='link'">         <xsl:text>l</xsl:text> </xsl:when>
+            <xsl:when test="$test_type='link_fail'">    <xsl:text>lf</xsl:text> </xsl:when>
             <xsl:otherwise>
                 <xsl:message terminate="yes">Incorrect test type "<xsl:value-of select="$test_type"/>"</xsl:message>
             </xsl:otherwise>