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

do not terminate on unknown status

[SVN r23460]
Aleksey Gurtovoy 22 лет назад
Родитель
Сommit
d0b24799a1

+ 10 - 1
tools/regression/xsl_reports/test_results.xsd

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
 
+    <!-- 
+    The following online services can be used to validate collected test results:
+
+        - http://apps.gotdotnet.com/xmltools/xsdvalidator/
+        - http://tools.decisionsoft.com/schemaValidate.html
+    -->
+
     <xs:simpleType name="test_result">
         <xs:restriction base="xs:NMTOKEN">
             <xs:enumeration value="fail"/>
@@ -9,7 +16,9 @@
     </xs:simpleType>
     
     <xs:simpleType name="run_test_result">
-        <xs:restriction base="test_result">
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="fail"/>
+            <xs:enumeration value="succeed"/>
             <xs:enumeration value="note"/>
         </xs:restriction>
     </xs:simpleType>

+ 6 - 0
tools/regression/xsl_reports/xsl/html/master.css

@@ -216,6 +216,7 @@ tr.summary-row td
 ,td.summary-expected
 ,td.summary-user-fail-expected
 ,td.summary-user-success
+,td.summary-unknown-status
 { 
     width: 60pt;
     text-align: center;
@@ -226,6 +227,11 @@ tr.summary-row td
     padding-right: 2pt;
 }
 
+td.summary-unknown-status
+{ 
+    background-color: white;
+}
+
  td.library-success-unexpected
 ,td.summary-success-unexpected
 { 

+ 2 - 6
tools/regression/xsl_reports/xsl/summary_page.xsl

@@ -235,7 +235,7 @@
             <xsl:text>summary-expected</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-            <xsl:value-of select="count( $current_cell )"/>
+            <xsl:text>summary-unknown-status</xsl:text>
         </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
@@ -295,11 +295,7 @@
             <xsl:text>summary-user-success</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-            <xsl:message terminate="yes">
-                Unknown status
-                <xsl:copy-of select="$current_cell">
-                </xsl:copy-of>
-            </xsl:message>
+            <xsl:text>summary-unknown-status</xsl:text>
         </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>

粤ICP备19079148号