Просмотр исходного кода

merge RC_1_32_0 fixes

[SVN r26334]
Aleksey Gurtovoy 21 лет назад
Родитель
Сommit
4d8c70f5e4

+ 1 - 1
tools/regression/xsl_reports/make_snapshot.py

@@ -121,7 +121,7 @@ def make_tarball_send_mail(
         , tag
         , user
         , site_dir
-	, mail
+        , mail
         ):
     try:
         mail_subject = '[Boost CVS tarball] Build for %s on %s' % ( tag, string.split(socket.gethostname(), '.')[0] )

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

@@ -94,7 +94,14 @@ http://www.boost.org/LICENSE_1_0.txt)
         <xsl:variable name="unexpected_success" select="$status = 'unexpected' and $actual_result = 'success'"/>
 
         <xsl:variable name="expected_reason">
-            <xsl:value-of select="$test_failures_markup/@reason"/>
+            <xsl:choose>
+                <xsl:when test="$test_failures_markup/@reason">
+                    <xsl:value-of select="$test_failures_markup/@reason"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$test_failures_markup2/@reason"/>
+                </xsl:otherwise>
+            </xsl:choose>
         </xsl:variable>
 
         <xsl:variable name="notes">

+ 19 - 6
tools/regression/xsl_reports/xsl/v2/html/library_developer_legend.html

@@ -27,7 +27,7 @@ http://www.boost.org/LICENSE_1_0.txt)
                 <tr class="library-row-single"><td class="library-success-unexpected">pass</td></tr>
                 </table>
             </td>
-            <td class="legend-item">Unexpected success; follow the link to see the details.</td>
+            <td class="legend-item">Unexpected success; follow the link for more details.</td>
         </tr>
         <tr>
             <td>
@@ -35,12 +35,28 @@ http://www.boost.org/LICENSE_1_0.txt)
                 <tr class="library-row-single"><td class="library-fail-expected">fail*</td></tr>
                 </table>
             </td>
-            <td class="legend-item">Expected failure; follow the link to see the details.</td>
+            <td class="legend-item">Expected failure; follow the link for more details.</td>
+        </tr>
+        <tr>
+            <td>
+                <table width="100%" summary="unusable legend" id="Table1">
+                <tr class="library-row-single"><td class="library-unusable">n/a</td></tr>
+                </table>
+            </td>
+            <td class="legend-item">The library author marked it as unusable on this particular platform/toolset.</td>
         </tr>
     </table>
     </td>
     <td>
     <table border="0" summary="legend">
+        <tr>
+            <td>
+                <table width="100%" summary="unresearched legend" id="Table2">
+                <tr class="library-row-single"><td class="library-fail-expected-unresearched">fail?</td></tr>
+                </table>
+            </td>
+            <td class="legend-item">Unsearched failure; follow the link for more details.</td>
+        </tr>
         <tr>
             <td>
                 <table width="100%" summary="unexpected new fail legend">
@@ -59,11 +75,8 @@ http://www.boost.org/LICENSE_1_0.txt)
         </tr>
         <tr>
             <td>
-                <table width="100%" summary="unusable legend">
-                <tr class="library-row-single"><td class="library-unusable">n/a</td></tr>
-                </table>
             </td>
-            <td class="legend-item">The library author marked it as unusable on particular platform/toolset.</td>
+            <td class="legend-item"></td>
         </tr>
     </table>
     </td>

粤ICP备19079148号