The format of explicit markup file has been changed to reflect the markup semntics more closely.

[SVN r21263]

status/explicit-failures-markup.xml

@@ -35,21 +35,92 @@
 
   <!-- Libraries -->
 
-  <mark-library name="lambda" as="unusable">
+    <library name="array">
+        <test name="array3">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>
+
+        <test name="array4">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>
+    </library>
+
+    <library name="concept_check">
+        <test name="class_concept_fail_expected">
+            <mark-failure>
+                <toolset name="cwpro8"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>
+    </library>
+
+    <library name="config">
+        <test name="config_test">
+            <mark-failure>
+                <toolset name="intel-win32"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>
+
+        <test name="limits_test">
+            <mark-failure>
+                <toolset name="cwpro8"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>
+    </library>
+
+    <library name="date_time">
+        <test name="testmicrosec_time_clock">
+            <mark-failure>
+                <toolset name="gcc"/>
+                <note refid="14"/>
+            </mark-failure>
+        </test>
+
+        <test name="*">
+            <mark-failure>
+                <toolset name="intel-win32"/>
+                <note refid="10"/>
+            </mark-failure>
+        </test>
+
+    </library>
+
+  <library name="lambda">
+    <mark-unusable>
       <toolset name="msvc"/>
       <toolset name="msvc-stlport"/>
+      <toolset name="borland"/>
+      <toolset name="borland-5.6.4"/>
+      <toolset name="borland-5.5.1"/>
+      <toolset name="vc7"/>
 
       <note>
         TBD: Explain why it is not usable 
       </note>
-  </mark-library>
-
-  <mark-library name="spirit" as="unusable">
-      <toolset name="msvc"/>
-      <toolset name="msvc-stlport"/>
-      <toolset name="borland-5.5.1"/>
-      <toolset name="borland-5.6.4"/>
-      <toolset name="vc7"/>
+    </mark-unusable>
+  </library>
+
+    <library name="spirit">
+        <mark-unusable>
+            <toolset name="msvc"/>
+            <toolset name="msvc-stlport"/>
+            <toolset name="borland-5.5.1"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="vc7"/>
       <note>
           <p>
             Historically, Spirit supported a lot of compilers, including (to some
@@ -82,71 +153,494 @@
           </p>
 
       </note>
-  </mark-library>
-
-  <!-- Failures -->
-
-  <mark-failure toolset="cwpro8" library="regex" test="*">
-    <note author="M.Bergal" date="11/29/2003">
-       ICE. Has been reported to Metrowerks by Beman?.
-    </note>
-  </mark-failure>
-
-  <mark-failure library="concept_check" test="class_concept_fail_expected" toolset="cwpro8">
-    <note author="B.Dawes">
-      The failure is caused by a compiler bug, which has been reported to the compiler supplier (or is already known to them).
-    </note>
-  </mark-failure>
-
-  <mark-failure library="config" test="limits_test" toolset="cwpro8">
-    <note author="B.Dawes">
-      The failure is caused by a compiler bug, which has been reported to the compiler supplier (or is already known to them).
-    </note>
-  </mark-failure>
-
-  <mark-failure library="function" test="allocator_test" toolset="msvc">
-    <note author="B.Dawes">
-      The failure is caused by a standard library bug, which has been reported to the standard library supplier (or is already known to them).
-    </note>
-  </mark-failure>
-  
-  <mark-failure library="function" test="allocator_test" toolset="vc7">
-    <note author="B.Dawes">
-      The failure is caused by a standard library bug, which has been reported to the standard library supplier (or is already known to them).
-    </note>
-  </mark-failure>
-
-   
-  <mark-failure library="function" test="lambda_test" toolset="vc7">
-    <note refid="3"/>
-  </mark-failure>  
-
-
-  <mark-failure library="iterator" test="interoperable_fail" toolset="*">
-    <note author="D. Abrahams">
-      This failure is caused by a compiler bug.  Templated operators
-      which combine different iterators built with iterator_facade or
-      iterator_adaptor be present in an overload set even when those
-      iterators are not interoperable.  The usual result is that error
-      messages generated by illegal use of these operators will be of
-      lower quality.
-    </note>
-  </mark-failure>
-
-  <mark-failure library="iterator" test="is_convertible_fail" toolset="*">
-    <note author="D. Abrahams">
-      This failure is caused by a compiler bug.
-      <code>is_convertible&lt;T,U&gt;::value</code> may be true for unrelated
-      iterators <code>T</code> and <code>U</code>
-      (including many of the Boost specialized adaptors) which use
-      <code>enable_if_convertible</code> to restrict the applicability
-      of converting constructors, even when <code>T</code> is not
-      convertible to <code>U</code> because instantiating the
-      conversion will cause a compilation failure.
-    </note>
-  </mark-failure>
-
-  <mark-test library="iterator" test="is_convertible_fail" as="corner case"/>
+        </mark-unusable>
+    </library>
+
+
+  <!-- function -->
+
+  <library name="function">
+
+    <test name="allocator_test">
+        <mark-failure>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+
+            <note author="B.Dawes" refid="5"/>
+        </mark-failure>
+    </test>
+
+    <test name="function_arith_cxx98">
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="3"/>
+        </mark-failure> 
+    </test>
+
+    <test name="function_ref_cxx98">
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="3"/>
+        </mark-failure> 
+    </test>
+
+    <test name="lambda_test">
+        <mark-failure>
+           <toolset name="borland"/>
+           <toolset name="borland-5.6.4"/>
+           <toolset name="msvc"/>
+           <toolset name="vc7"/>
+            <note refid="3"/>
+        </mark-failure> 
+
+        <mark-failure>
+            <toolset name="cwpro8"/>
+            <note refid="2"/>
+        </mark-failure> 
+    </test>
+
+    <test name="lib_function_test">
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="3"/>
+        </mark-failure> 
+
+        <mark-failure>
+            <toolset name="cwpro8"/>
+            <note refid="2"/>
+        </mark-failure> 
+    </test>
+
+    <test name="mem_fun_cxx98">
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="3"/>
+        </mark-failure> 
+
+        <mark-failure>
+            <toolset name="cwpro8"/>
+            <note refid="3"/>
+        </mark-failure> 
+    </test>
+
+    <test name="std_bind_cxx98">
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="3"/>
+        </mark-failure> 
+    </test>
+
+    <test name="std_bind_portable">
+        <mark-failure>
+            <toolset name="msvc"/>
+            <note refid="5"/>
+        </mark-failure>
+    </test>
+
+    <test name="sum_avg_cxx98">
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="3"/>
+        </mark-failure> 
+    </test>
+
+  </library>
+
+
+  <!-- iterator -->
+
+  <library name="iterator">
+    <test name="interoperable_fail">
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="2"/>
+        </mark-failure>
+
+        <mark-failure>
+            <toolset name="gcc"/>
+            <note refid="3"/>
+        </mark-failure>
+
+        <mark-failure> 
+            <toolset name="*"/>
+            <note author="D. Abrahams">
+            This failure is caused by a compiler bug.  Templated operators
+            which combine different iterators built with iterator_facade or
+            iterator_adaptor be present in an overload set even when those
+            iterators are not interoperable.  The usual result is that error
+            messages generated by illegal use of these operators will be of
+            lower quality.
+            </note>
+        </mark-failure>
+    </test>
+
+    <test name="is_convertible_fail" corner-case="yes" >
+        <mark-failure>
+            <toolset name="borland"/>
+            <toolset name="borland-5.6.4"/>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="2"/>
+        </mark-failure>
+
+        <mark-failure>
+          <toolset name="*"/>
+            <note author="D. Abrahams">
+                This failure is caused by a compiler bug.
+                <code>is_convertible&lt;T,U&gt;::value</code> may be true for unrelated
+                iterators <code>T</code> and <code>U</code>
+                (including many of the Boost specialized adaptors) which use
+                <code>enable_if_convertible</code> to restrict the applicability
+                of converting constructors, even when <code>T</code> is not
+                convertible to <code>U</code> because instantiating the
+                conversion will cause a compilation failure.
+            </note>
+        </mark-failure>
+    </test>
+  </library>
+
+    <!-- math -->
+
+    <library name="math">
+        <test name="quaternion_mult_incl_test">
+            <mark-failure>
+                <toolset name="intel-win32"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>
+    </library>
+
+    <!-- python -->
+
+    <library name="python">
+        <mark-unusable>
+            <toolset name="borland"/>
+            <toolset name="borland-5.5.1"/>
+            <toolset name="borland-5.6.4"/>
+            <note refid="2"/>
+            <note refid="17"/>
+        </mark-unusable>
+    </library>
+
+    <!-- random -->
+
+    <library name="random">
+        <mark-unusable>
+            <toolset name="msvc"/>
+            <toolset name="vc7"/>
+            <note refid="10"/>
+        </mark-unusable>
+
+        <test name="random_test">
+            <mark-failure>
+                <toolset name="cwpro8"/>
+                <toolset name="como-win32"/>
+                <toolset name="intel-win32"/>
+                <note refid="3"/>
+            </mark-failure>
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <note refid="2"/>
+            </mark-failure>
+        </test>
+    </library>
+
+    <!-- regex -->
+
+    <library name="regex">
+        <mark-unusable>
+            <toolset name="intel-win32"/>
+            <note refid="10"/>
+        </mark-unusable>
+        <test name="*">
+            <mark-failure toolset="cwpro8" library="regex" test="*">
+                <note author="M.Bergal" date="11/29/2003">
+                    ICE. Has been reported to Metrowerks by Beman?.
+                </note>
+            </mark-failure>
+        </test>
+    </library>
+
+    <!-- signals -->
+
+    <library name="signals">
+        <test name="signal_test">
+            <mark-failure>
+                <toolset name="cwpro8"/>
+                <note refid="2"/>
+            </mark-failure>
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>
+    </library>
+
+    <!-- static_assert -->
+
+    <library name="static_assert">
+        <test name="static_assert_test_fail_8">
+            <toolset name="cwpro8"/>
+            <note refid="3"/>
+        </test>
+    </library>
+
+    <!-- test -->
+
+    <library name="test">
+        <test name="errors_handling_test">
+            <toolset name="como-win32"/>
+            <note refid="3"/>
+        </test>
+    </library>
+
+
+    <!-- thread -->
+
+    <library name="thread">
+        <mark-unusable>
+            <toolset name="gcc"/>
+            <note refid="6"/>
+        </mark-unusable>
+        <mark-unusable>
+            <toolset name="como-win32"/>
+            <note refid="10"/>
+        </mark-unusable>
+
+        <test name="test_mutex">
+            <mark-failure>
+                <toolset name="vc7"/>            
+                <note refid="0"/>
+                <note refid="6"/>
+            </mark-failure>
+        </test>
+
+    </library>
+
+    <!-- tuple -->
+
+    <library name="tuple">
+        <test name="io_test">
+            <toolset name="intel-win32"/>
+            <note refid="3"/>
+        </test>
+    </library>
+
+    <!-- type_traits -->
+
+    <library name="type_traits">
+        <test name="function_traits_test">
+            <markup-failure>
+                <toolset name="msvc"/>             
+                <toolset name="vc7"/>             
+            </markup-failure>
+        </test>
+
+        <test name="remove_bounds_test">
+            <markup-failure>
+                <toolset name="msvc"/>             
+                <toolset name="vc7"/>             
+            </markup-failure>
+        </test>
+
+        <test name="remove_const_test">
+            <markup-failure>
+                <toolset name="msvc"/>             
+                <toolset name="vc7"/>             
+            </markup-failure>
+        </test>
+
+        <test name="remove_cv_test">
+            <markup-failure>
+                <toolset name="msvc"/>             
+                <toolset name="vc7"/>             
+            </markup-failure>
+        </test>
+
+        <test name="remove_pointer_test">
+            <markup-failure>
+                <toolset name="msvc"/>             
+                <toolset name="vc7"/>             
+            </markup-failure>
+        </test>
+
+        <test name="remove_reference_test">
+            <markup-failure>
+                <toolset name="msvc"/>             
+                <toolset name="vc7"/>             
+            </markup-failure>
+        </test>
+
+        <test name="remove_volatile_test">
+            <markup-failure>
+                <toolset name="msvc"/>             
+                <toolset name="vc7"/>             
+            </markup-failure>
+        </test>
+
+    </library>
+
+    <!-- utility -->
+
+    <library name="utility">
+        <test name="enable_if_constructors">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="enable_if_dummy_arg_disambiguation">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="enable_if_lazy">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="enable_if_lazy_test">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="enable_if_member_templates">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="enable_if_namespace_disambiguation">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="enable_if_no_disambiguation">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="enable_if_partial_specializations">
+            <mark-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </mark-failure>
+        </test>        
+
+        <test name="fun_out_iter_example">
+            <mark-failure>
+                <toolset name="como-win32"/>
+                <note refid="4"/>
+            </mark-failure>
+        </test>
+    
+    </library>
+
+    <library name="variant">
+        <test name="recursive_variant_test">
+            <markup-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <toolset name="como-win32"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </markup-failure>
+        </test>
+
+        <test name="variant_test1">
+            <markup-failure>
+                <toolset name="borland"/>
+                <toolset name="borland-5.6.4"/>
+                <note refid="2"/>
+            </markup-failure>
+        </test>
+
+        <test name="variant_reference_test">
+            <markup-failure>
+                <toolset name="cwpro8"/>
+                <toolset name="msvc"/>
+                <toolset name="vc7"/>
+                <note refid="3"/>
+            </markup-failure>
+            <markup-failure>
+                <toolset name="intel-win32"/>
+                <note refid="2"/>
+            </markup-failure>
+        </test>
+
+    </library>
+
+
 
   <!-- Standard note definitions -->
 
@@ -204,3 +698,4 @@
 
 
 </explicit-failures-markup>
+

tools/regression/xsl_reports/report.py

@@ -127,6 +127,9 @@ def msxsl( xml_file, xsl_file, output_file, parameters = None ):
     os.system( transform_command )    
 
 def libxslt( xml_file, xsl_file, output_file, parameters = None ):
+
+    if sys.platform == "win32":
+        os.chdir( os.path.dirname( xsl_file ) )
     transform_command = "xsltproc"
     transform_command = transform_command + ' -o ' + "%s" % output_file
 

tools/regression/xsl_reports/xsl/add_expected_results.xsl

@@ -45,7 +45,7 @@
       </xsl:variable>
 
       <xsl:variable name="expected_results_test_case" select="$expected_results//*/test-result[ @library=$library and ( @test-name=$test-name or @test-name='*' ) and @toolset = $toolset]"/>
-      <xsl:variable name="failures_markup" select="$failures_markup//*/mark-failure[ @library=$library and ( @test = $test-name or @test = '*' ) and ( @toolset = $toolset or @toolset = '*' ) ]"/>
+      <xsl:variable name="failures_markup" select="$failures_markup//library[@name=$library]/test[@name = $test-name or @name = '*']/mark-failure[  ( toolset/@name = $toolset or toolset/@name = '*' ) ]"/>
       <xsl:variable name="is_new">
          <xsl:choose>
             <xsl:when test="$expected_results_test_case">
@@ -55,7 +55,7 @@
          </xsl:choose>
       </xsl:variable>
 
-
+      
       <xsl:variable name="expected_result">
         <xsl:choose>
           <xsl:when test='count( $failures_markup ) &gt; 0'>
@@ -74,7 +74,6 @@
         </xsl:choose>
       </xsl:variable>
 
-      <!--      <a><xsl:value-of select="count( $failures_markup )"/></a> -->
       <xsl:variable name="status">
         <xsl:choose>
           <xsl:when test="count( $failures_markup ) &gt; 0">
@@ -111,6 +110,7 @@
       <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>
+      <!--<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/result_page.xsl

@@ -287,7 +287,7 @@
             </a>
           </div>
 
-          <xsl:variable name="library_marks" select="$explicit_markup//mark-library[ @name = $library ]"/>
+          <xsl:variable name="library_marks" select="$explicit_markup//library[ @name = $library ]/mark-unusable"/>
 
           <table border="0" cellspacing="0" cellpadding="0" class="detail-table" summary="library results">
 
@@ -310,11 +310,12 @@
               <xsl:variable name="lib_tests" select="//test-log[@library = $library]" />
               <xsl:variable name="lib_unique_test_names" 
                 select="$lib_tests[ generate-id(.) = generate-id( key('test_name_key', concat( @library, '&gt;@&lt;', @test-name ) ) ) ]" />
-              <xsl:variable name="lib_corner_case_tests_markup" select="$explicit_markup//mark-test[ @as='corner case' and @library = $library ]"/>
+
+              <xsl:variable name="lib_corner_case_tests_markup" select="$explicit_markup//library[ @name = $library ]/test[ @corner-case='yes' ]"/>
               
-              <xsl:variable name="lib_general_tests" select="$lib_unique_test_names[ not( @test-name = $lib_corner_case_tests_markup/@test )  ]"/>
+              <xsl:variable name="lib_general_tests" select="$lib_unique_test_names[ not( @test-name = $lib_corner_case_tests_markup/@name )  ]"/>
 
-              <xsl:variable name="lib_corner_case_tests" select="$lib_unique_test_names[ @test-name = $lib_corner_case_tests_markup/@test ] " />
+              <xsl:variable name="lib_corner_case_tests" select="$lib_unique_test_names[ @test-name = $lib_corner_case_tests_markup/@name ] " />
             
               <xsl:for-each select="$lib_general_tests">
                 <xsl:variable name="test_name" select="./@test-name"/>
@@ -406,6 +407,10 @@
                         </xsl:when>
                       </xsl:choose>
                     </span>
+                    <xsl:if test="@refid">
+                        <xsl:variable name="refid" select="@refid"/>
+                        <xsl:copy-of select="$explicit_markup//note[ $refid = @id ]/node()"/>
+                    </xsl:if>
                     <xsl:copy-of select="node()"/>
                   </td>
                 </tr>
@@ -446,7 +451,7 @@
         <xsl:when test="not( $test_log )">
           <xsl:text>detail-missing</xsl:text>
         </xsl:when>
-        <xsl:when test="$explicit_markup//mark-library[ @name=$test_log/@library and ( @toolset = $test_log/@toolset or toolset/@name = $test_log/@toolset )  ]">
+        <xsl:when test="$explicit_markup//library[ @name=$test_log/@library ]/mark-unusable[ @toolset = $test_log/@toolset or toolset/@name = $test_log/@toolset ]">
           <xsl:text>detail-unusable</xsl:text>
         </xsl:when>
         <xsl:otherwise>
@@ -493,7 +498,7 @@
         <xsl:when test="not( $test_log )">
           <xsl:text>detail-missing</xsl:text>
         </xsl:when>
-        <xsl:when test="$explicit_markup//mark-library[ @name=$test_log/@library and ( @toolset = $test_log/@toolset or toolset/@name = $test_log/@toolset )  ]">
+        <xsl:when test="$explicit_markup//library[ @name=$test_log/@library ]/test/mark-library[ @toolset = $test_log/@toolset or toolset/@name = $test_log/@toolset ]">
           <xsl:text>detail-unusable</xsl:text>
         </xsl:when>
         <xsl:when test="$test_log[@result='fail' and @status='unexpected']">

tools/regression/xsl_reports/xsl/summary_page.xsl

@@ -307,7 +307,7 @@
   <xsl:param name="expected_test_count"/>
   <xsl:variable name="class">
     <xsl:choose> 
-      <xsl:when test="$explicit_markup//mark-library[ @name = $library and @as='unusable' and (@toolset=$toolset or toolset/@name=$toolset)]">
+      <xsl:when test="$explicit_markup//library[ @name = $library ]/mark-unusable[ @toolset=$toolset or toolset/@name=$toolset]">
         <xsl:text>summary-unusable</xsl:text>
       </xsl:when>
       <xsl:when test="count( $current_cell ) &lt; $expected_test_count">
@@ -368,7 +368,7 @@
   <xsl:param name="expected_test_count"/>
   <xsl:variable name="class">
     <xsl:choose>
-      <xsl:when test="$explicit_markup//mark-library[ @name = $library and @as='unusable' and (@toolset=$toolset or toolset/@name=$toolset)]">
+      <xsl:when test="$explicit_markup//library[ @name = $library ]/mark-unusable[ @toolset=$toolset or toolset/@name=$toolset ]">
         <xsl:text>summary-unusable</xsl:text>
       </xsl:when>
       <xsl:when test="count( $current_cell ) &lt; $expected_test_count">