Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1147546 
into lp:zorba.

Commit message:
- fix for lp:1147546
- updated FOTSZorbaManifest to state we are not interested in running test 
cases created *only* for XPath, we are runnning only those who are written for 
XQuery or XPath *and* XQuery.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
  Bug #1147546 in Zorba: "FLWOR failures"
  https://bugs.launchpad.net/zorba/+bug/1147546

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1147546/+merge/159354

- fix for lp:1147546
- updated FOTSZorbaManifest to state we are not interested in running test 
cases created *only* for XPath, we are runnning only those who are written for 
XQuery or XPath *and* XQuery.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1147546/+merge/159354
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-16 20:11:02 +0000
+++ test/fots/CMakeLists.txt	2013-04-17 11:17:31 +0000
@@ -168,8 +168,6 @@
 EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-014 0)
 EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-015 0)
 EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-017 0)
-EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-018 0)
-EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0)
 EXPECTED_FOTS_FAILURE (fn-last last-24 0)
 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
 EXPECTED_FOTS_FAILURE (fn-matches.re re00056 1131984)
@@ -206,8 +204,6 @@
 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 0)
 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 0)
 EXPECTED_FOTS_FAILURE (fn-position position-23 0)
-EXPECTED_FOTS_FAILURE (fn-replace fn-replace-34 0)
-EXPECTED_FOTS_FAILURE (fn-replace fn-replace-35 0)
 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-42 0)
 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-26 0)
 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 0)
@@ -280,9 +276,7 @@
 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-ncname-001 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-normalizedString-001 0)
-EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-normalizedString-001b 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-token-001 0)
-EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-token-001b 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-17 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-22 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-23 0)
@@ -345,16 +339,7 @@
 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof139 1160559)
 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof140 0)
 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr cbcl-instance-of-001 0)
-EXPECTED_FOTS_FAILURE (prod-LetClause LetExpr020a 0)
-EXPECTED_FOTS_FAILURE (prod-Literal Literals056a 0)
-EXPECTED_FOTS_FAILURE (prod-Literal Literals057a 0)
-EXPECTED_FOTS_FAILURE (prod-Literal Literals058a 0)
-EXPECTED_FOTS_FAILURE (prod-Literal Literals059a 0)
-EXPECTED_FOTS_FAILURE (prod-Literal Literals060a 0)
-EXPECTED_FOTS_FAILURE (prod-Literal Literals061a 0)
 EXPECTED_FOTS_FAILURE (prod-Literal K-Literals-30 0)
-EXPECTED_FOTS_FAILURE (prod-Literal K-Literals-31a 0)
-EXPECTED_FOTS_FAILURE (prod-Literal K-Literals-47a 0)
 EXPECTED_FOTS_FAILURE (prod-Literal K2-Literals-7 0)
 EXPECTED_FOTS_FAILURE (prod-Literal K2-Literals-20 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-1 0)
@@ -388,10 +373,6 @@
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy50 0)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy51 0)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy59 0)
-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-5p 0)
-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-7p 0)
-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-9-ns 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 0)
@@ -443,7 +424,6 @@
 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-1 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-3 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0)
-EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0)
 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0)
@@ -463,18 +443,12 @@
 EXPECTED_FOTS_FAILURE (prod-WindowClause SlidingWindowExpr507 0)
 EXPECTED_FOTS_FAILURE (prod-WindowClause TumblingWindowExpr507 0)
 EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-002 0)
-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-004b 0)
 EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-006 0)
-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-006b 0)
-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-009b 0)
-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-012b 0)
 EXPECTED_FOTS_FAILURE (xs-base64Binary base64-115 0)
 EXPECTED_FOTS_FAILURE (xs-double xs-double-004 0)
 EXPECTED_FOTS_FAILURE (xs-normalizedString cbcl-normalizedstring-002 0)
-EXPECTED_FOTS_FAILURE (xs-normalizedString cbcl-normalizedstring-002b 0)
 EXPECTED_FOTS_FAILURE (xs-normalizedString cbcl-normalizedstring-004 0)
 EXPECTED_FOTS_FAILURE (xs-token cbcl-token-002 0)
-EXPECTED_FOTS_FAILURE (xs-token cbcl-token-002b 0)
 EXPECTED_FOTS_FAILURE (xs-token cbcl-token-004 0)
 EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 0)
 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 0)

=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
--- test/fots_driver/FOTSZorbaManifest.xml	2013-04-02 23:56:10 +0000
+++ test/fots_driver/FOTSZorbaManifest.xml	2013-04-17 11:17:31 +0000
@@ -3,7 +3,7 @@
   <dependency type="feature" value="directory-as-collection-uri" satisfied="false"/>
   <dependency type="feature" value="higherOrderFunctions" satisfied="true"/>
   <dependency type="feature" value="moduleImport" satisfied="true"/>
-  <dependency type="feature" value="namespace-axis" satisfied="false"/>               <!-- Is this correct? -->
+  <dependency type="feature" value="namespace-axis" satisfied="false"/>
   <dependency type="feature" value="schema-location-hint" satisfied="false"/>         <!-- Is this correct? -->
   <dependency type="feature" value="schemaAware" satisfied="true"/>
   <dependency type="feature" value="schemaImport" satisfied="true"/>
@@ -11,12 +11,14 @@
   <dependency type="feature" value="staticTyping" satisfied="false"/>
   <dependency type="feature" value="xpath-1.0-compatibility" satisfied="true"/>       <!-- Is this correct? -->
 
+  <!-- We are not interested in running XPath test cases, we only run XQuery test cases -->
+  <dependency type="spec" value="XP10+" satisfied="false"/>
+  <dependency type="spec" value="XP20" satisfied="false"/>
+  <dependency type="spec" value="XP20+" satisfied="false"/>
+  <dependency type="spec" value="XP30+" satisfied="false"/>
+  
   <dependency type="spec" value="XP10 XQ10" satisfied="true"/>
-  <dependency type="spec" value="XP10+" satisfied="true"/>
   <dependency type="spec" value="XP20 XQ10" satisfied="true"/>
-  <dependency type="spec" value="XP20" satisfied="true"/>
-  <dependency type="spec" value="XP20+" satisfied="true"/>
-  <dependency type="spec" value="XP30+" satisfied="true"/>
   <dependency type="spec" value="XP30+ XQ10+" satisfied="true"/>
   <dependency type="spec" value="XP30+ XQ30+" satisfied="true"/>
   <dependency type="spec" value="XQ10" satisfied="true"/>

=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-03-29 06:15:19 +0000
+++ test/fots_driver/environment.xq	2013-04-17 11:17:31 +0000
@@ -89,7 +89,7 @@
 
   let $v30 :=
     some $dep in $deps
-    satisfies $dep[contains(@value, "XQ30") or contains(@value, "XP30")]
+    satisfies $dep[contains(@value, "XQ30")]
 
   return
     if ($v30 and not(contains($test, "xquery version")))

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to