Browse Source

Merge run_mpi test type support.

[SVN r55996]
Vladimir Prus 16 years ago
parent
commit
d18cb1bc3f

+ 1 - 1
tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl

@@ -36,7 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt)
                 </xsl:when>
                 </xsl:when>
                 <xsl:when test="$type='link' or $type='link_fail' or $type='' or $type='lib' or $test_log/link/@result='fail'">
                 <xsl:when test="$type='link' or $type='link_fail' or $type='' or $type='lib' 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: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' or $type='run_pyd'">
+                <xsl:when test="$type='run' or $type='run_fail' or $type='run_pyd' or $type='run_mpi'">
                     <xsl:value-of select="count( $test_log/compile) = 1  and count( $test_log/link)  = 1 and count($test_log/run) = 1 "/>
                     <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>
                 <xsl:otherwise> 
                 <xsl:otherwise> 

+ 1 - 1
tools/regression/xsl_reports/xsl/v2/common.xsl

@@ -151,7 +151,7 @@ http://www.boost.org/LICENSE_1_0.txt)
         <xsl:param name="test_log"/>       
         <xsl:param name="test_log"/>       
         <xsl:variable name="type" select="$test_log/@test-type"/>
         <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' 
         <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'"/>
+                             or $type='run' or $type='run_fail' or $type='run_pyd' or $type='run_mpi'"/>
     </func:function>
     </func:function>
 
 
 
 

+ 1 - 0
tools/regression/xsl_reports/xsl/v2/result_page.xsl

@@ -98,6 +98,7 @@ http://www.boost.org/LICENSE_1_0.txt)
             <xsl:variable name="test_type" select="./@test-type"/>
             <xsl:variable name="test_type" select="./@test-type"/>
             <xsl:choose>
             <xsl:choose>
             <xsl:when test="$test_type='run_pyd'">      <xsl:text>r</xsl:text>  </xsl:when>
             <xsl:when test="$test_type='run_pyd'">      <xsl:text>r</xsl:text>  </xsl:when>
+            <xsl:when test="$test_type='run_mpi'">      <xsl:text>r</xsl:text>  </xsl:when>
             <xsl:when test="$test_type='run'">          <xsl:text>r</xsl:text>  </xsl:when>
             <xsl:when test="$test_type='run'">          <xsl:text>r</xsl:text>  </xsl:when>
             <xsl:when test="$test_type='run_fail'">     <xsl:text>rf</xsl:text> </xsl:when>
             <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'">      <xsl:text>c</xsl:text>  </xsl:when>

粤ICP备19079148号