Zorba

Merge lp:~zorba-coders/zorba/fix_bug_1147546 into lp:zorba

  1. fix_bug_1147546
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11378
Merged at revision: 11378
Proposed branch: lp:~zorba-coders/zorba/fix_bug_1147546
Merge into: lp:zorba
Diff against target: 131 lines (+8/-32)
3 files modified
test/fots/CMakeLists.txt (+0/-26)
test/fots_driver/FOTSZorbaManifest.xml (+7/-5)
test/fots_driver/environment.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_1147546
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Sorin Marian Nasoi Approve
Review via email: mp+159354@code.launchpad.net

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.

Description of the change

- 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.

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1147546-2013-04-17T11-17-41.513Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_1147546-2013-04-17T11-17-41.513Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 2 Pending.

Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1147546-2013-04-17T11-44-38.019Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_1147546-2013-04-17T11-44-38.019Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/fots/CMakeLists.txt'
2--- test/fots/CMakeLists.txt 2013-04-16 20:11:02 +0000
3+++ test/fots/CMakeLists.txt 2013-04-17 11:17:31 +0000
4@@ -168,8 +168,6 @@
5 EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-014 0)
6 EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-015 0)
7 EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-017 0)
8-EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-018 0)
9-EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0)
10 EXPECTED_FOTS_FAILURE (fn-last last-24 0)
11 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
12 EXPECTED_FOTS_FAILURE (fn-matches.re re00056 1131984)
13@@ -206,8 +204,6 @@
14 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 0)
15 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 0)
16 EXPECTED_FOTS_FAILURE (fn-position position-23 0)
17-EXPECTED_FOTS_FAILURE (fn-replace fn-replace-34 0)
18-EXPECTED_FOTS_FAILURE (fn-replace fn-replace-35 0)
19 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-42 0)
20 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-26 0)
21 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 0)
22@@ -280,9 +276,7 @@
23 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
24 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-ncname-001 0)
25 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-normalizedString-001 0)
26-EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-normalizedString-001b 0)
27 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-token-001 0)
28-EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-token-001b 0)
29 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-17 0)
30 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-22 0)
31 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-23 0)
32@@ -345,16 +339,7 @@
33 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof139 1160559)
34 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof140 0)
35 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr cbcl-instance-of-001 0)
36-EXPECTED_FOTS_FAILURE (prod-LetClause LetExpr020a 0)
37-EXPECTED_FOTS_FAILURE (prod-Literal Literals056a 0)
38-EXPECTED_FOTS_FAILURE (prod-Literal Literals057a 0)
39-EXPECTED_FOTS_FAILURE (prod-Literal Literals058a 0)
40-EXPECTED_FOTS_FAILURE (prod-Literal Literals059a 0)
41-EXPECTED_FOTS_FAILURE (prod-Literal Literals060a 0)
42-EXPECTED_FOTS_FAILURE (prod-Literal Literals061a 0)
43 EXPECTED_FOTS_FAILURE (prod-Literal K-Literals-30 0)
44-EXPECTED_FOTS_FAILURE (prod-Literal K-Literals-31a 0)
45-EXPECTED_FOTS_FAILURE (prod-Literal K-Literals-47a 0)
46 EXPECTED_FOTS_FAILURE (prod-Literal K2-Literals-7 0)
47 EXPECTED_FOTS_FAILURE (prod-Literal K2-Literals-20 0)
48 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-1 0)
49@@ -388,10 +373,6 @@
50 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy50 0)
51 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy51 0)
52 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy59 0)
53-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-5p 0)
54-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-7p 0)
55-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
56-EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
57 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
58 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-9-ns 0)
59 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 0)
60@@ -443,7 +424,6 @@
61 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-1 0)
62 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-3 0)
63 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0)
64-EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0)
65 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0)
66 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0)
67 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0)
68@@ -463,18 +443,12 @@
69 EXPECTED_FOTS_FAILURE (prod-WindowClause SlidingWindowExpr507 0)
70 EXPECTED_FOTS_FAILURE (prod-WindowClause TumblingWindowExpr507 0)
71 EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-002 0)
72-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-004b 0)
73 EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-006 0)
74-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-006b 0)
75-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-009b 0)
76-EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-012b 0)
77 EXPECTED_FOTS_FAILURE (xs-base64Binary base64-115 0)
78 EXPECTED_FOTS_FAILURE (xs-double xs-double-004 0)
79 EXPECTED_FOTS_FAILURE (xs-normalizedString cbcl-normalizedstring-002 0)
80-EXPECTED_FOTS_FAILURE (xs-normalizedString cbcl-normalizedstring-002b 0)
81 EXPECTED_FOTS_FAILURE (xs-normalizedString cbcl-normalizedstring-004 0)
82 EXPECTED_FOTS_FAILURE (xs-token cbcl-token-002 0)
83-EXPECTED_FOTS_FAILURE (xs-token cbcl-token-002b 0)
84 EXPECTED_FOTS_FAILURE (xs-token cbcl-token-004 0)
85 EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 0)
86 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 0)
87
88=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
89--- test/fots_driver/FOTSZorbaManifest.xml 2013-04-02 23:56:10 +0000
90+++ test/fots_driver/FOTSZorbaManifest.xml 2013-04-17 11:17:31 +0000
91@@ -3,7 +3,7 @@
92 <dependency type="feature" value="directory-as-collection-uri" satisfied="false"/>
93 <dependency type="feature" value="higherOrderFunctions" satisfied="true"/>
94 <dependency type="feature" value="moduleImport" satisfied="true"/>
95- <dependency type="feature" value="namespace-axis" satisfied="false"/> <!-- Is this correct? -->
96+ <dependency type="feature" value="namespace-axis" satisfied="false"/>
97 <dependency type="feature" value="schema-location-hint" satisfied="false"/> <!-- Is this correct? -->
98 <dependency type="feature" value="schemaAware" satisfied="true"/>
99 <dependency type="feature" value="schemaImport" satisfied="true"/>
100@@ -11,12 +11,14 @@
101 <dependency type="feature" value="staticTyping" satisfied="false"/>
102 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="true"/> <!-- Is this correct? -->
103
104+ <!-- We are not interested in running XPath test cases, we only run XQuery test cases -->
105+ <dependency type="spec" value="XP10+" satisfied="false"/>
106+ <dependency type="spec" value="XP20" satisfied="false"/>
107+ <dependency type="spec" value="XP20+" satisfied="false"/>
108+ <dependency type="spec" value="XP30+" satisfied="false"/>
109+
110 <dependency type="spec" value="XP10 XQ10" satisfied="true"/>
111- <dependency type="spec" value="XP10+" satisfied="true"/>
112 <dependency type="spec" value="XP20 XQ10" satisfied="true"/>
113- <dependency type="spec" value="XP20" satisfied="true"/>
114- <dependency type="spec" value="XP20+" satisfied="true"/>
115- <dependency type="spec" value="XP30+" satisfied="true"/>
116 <dependency type="spec" value="XP30+ XQ10+" satisfied="true"/>
117 <dependency type="spec" value="XP30+ XQ30+" satisfied="true"/>
118 <dependency type="spec" value="XQ10" satisfied="true"/>
119
120=== modified file 'test/fots_driver/environment.xq'
121--- test/fots_driver/environment.xq 2013-03-29 06:15:19 +0000
122+++ test/fots_driver/environment.xq 2013-04-17 11:17:31 +0000
123@@ -89,7 +89,7 @@
124
125 let $v30 :=
126 some $dep in $deps
127- satisfies $dep[contains(@value, "XQ30") or contains(@value, "XP30")]
128+ satisfies $dep[contains(@value, "XQ30")]
129
130 return
131 if ($v30 and not(contains($test, "xquery version")))

Subscribers

People subscribed via source and target branches