SVN commit 547135 by englich:

Provide alternative baselines for two tests, for Saxon.


 M  +13 -22    createXQTSCatalog.xsl  
 M  +1 -1      functions-sequences.xml  
 M  +1 -1      logical-expressions.xml  


--- trunk/tests/kxpathtests/tests/createXQTSCatalog.xsl #547134:547135
@@ -180,21 +180,6 @@
        <!-- We never use input files. -->
        <ts:input-file role="principal-data" variable="input-context">emptydoc</ts:input-file>
 
-      <xsl:if test="@type = 'fail-statically' or @type = 'fail-dynamically'">
-        <xsl:for-each select="es:split(@errorCode)">
-          <ts:expected-error>
-            <xsl:choose>
-              <xsl:when test="."><xsl:value-of select="."/></xsl:when>
-              <xsl:otherwise>
-                <xsl:message terminate="yes">
-                  No error code for test: <xsl:value-of select="."/>
-                </xsl:message>
-              </xsl:otherwise>
-            </xsl:choose>
-          </ts:expected-error>
-        </xsl:for-each>
-      </xsl:if>
-
       <xsl:if test="@type = 'ebv'">
         <xsl:variable name="baselineFile" select="concat($name, '.txt')"/>
         <ts:output-file role="principal" compare="Text">
@@ -204,15 +189,21 @@
         <ec:document href="ExpectedTestResults/{$filePath}{$baselineFile}"
                      method="text">true</ec:document>
 
-        <xsl:if test="@errorCode">
-          <xsl:message terminate="yes">
-            The following test has an error code even though it's not supposed to fail:
-              <xsl:value-of select="."/>
-          </xsl:message>
-        </xsl:if>
-
       </xsl:if>
 
+      <xsl:for-each select="es:split(@errorCode)">
+        <ts:expected-error>
+          <xsl:choose>
+            <xsl:when test="."><xsl:value-of select="."/></xsl:when>
+            <xsl:otherwise>
+              <xsl:message terminate="yes">
+                No error code for test: <xsl:value-of select="."/>
+              </xsl:message>
+            </xsl:otherwise>
+          </xsl:choose>
+        </ts:expected-error>
+      </xsl:for-each>
+
        <xsl:variable name="aligner" select ="'                                                     '"/>
        <xsl:variable name="purpose" select="concat('Purpose: ', $description)"/>
 
--- trunk/tests/kxpathtests/tests/functions-sequences.xml #547134:547135
@@ -180,7 +180,7 @@
 		<test-case type="ebv">count(insert-before((1, 2, 3, 4), 1, ())) eq 4</test-case>
 		<test-case type="ebv">count(insert-before((1, 2, 3), 30, (4, 5, 6))) eq 6</test-case>
 		<test-case type="ebv">count(insert-before((), 30, (1, 2, 3))) eq 3</test-case>
-		<test-case errorCode="FOER0000" type="fail-dynamically">count(insert-before((error(), 1), 1, (1, "two", 3))) > 1</test-case>
+		<test-case errorCode="FOER0000" type="ebv">count(insert-before((error(), 1), 1, (1, "two", 3))) > 1</test-case>
 
 		<test-case description="Apply a predicate to the result of fn:insert-before()."
 		type="ebv">insert-before((1, current-time(), 3), 1, (4, 5, 6))[last()] eq 3</test-case>
--- trunk/tests/kxpathtests/tests/logical-expressions.xml #547134:547135
@@ -98,6 +98,6 @@
 
 	<test-case errorCode="FORG0006" type="fail-statically"
 		>"a string is ok" and QName("", "local")</test-case>
-	<test-case errorCode="FORG0006" type="fail-statically"
+	<test-case errorCode="FORG0006" type="ebv"
 		>"a string is ok" or QName("", "local")</test-case>
 </test-collection>