Zorba

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

  1. bump_FOTS_snapshot_May_1st
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 11426
Merged at revision: 11425
Proposed branch: lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_1st
Merge into: lp:zorba
Diff against target: 219 lines (+15/-45)
5 files modified
test/fots/CMakeLists.txt (+2/-13)
test/fots/ImportFOTS.cmake (+1/-1)
test/fots_driver/FOTSZorbaManifest.xml (+1/-0)
test/fots_driver/W3C_submission_template.xml (+5/-5)
test/fots_driver/fots-driver.xq (+6/-26)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_1st
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Sorin Marian Nasoi Approve
Review via email: mp+161934@code.launchpad.net

Commit message

- updated FOTS snapshot to May 1st
- updated expected failures accordingly
- updated W3C_submission_template.xml
- updated FOTSZorbaManifest to include the newly added "infoset-dtd" dependency
- updated FOTS driver to check for "infoset-dtd" dependency instead of certain test-case and test-set names

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/bump_FOTS_snapshot_May_1st-2013-05-01T19-32-43.949Z/log.html

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bump_FOTS_snapshot_May_1st-2013-05-01T19-32-43.949Z 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-05-01 10:08:16 +0000
3+++ test/fots/CMakeLists.txt 2013-05-01 19:32:46 +0000
4@@ -119,21 +119,11 @@
5 #All these entries should have a *valid* opened bug number from W3C bugzilla.
6 EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport qischema040 21339)
7 EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport qischema040a 21339)
8-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en126 21423)
9-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en127 21423)
10-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en128 21423)
11-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en132 21423)
12-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en133 21423)
13-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en134 21423)
14-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-dateTime format-dateTime-011 21794)
15 EXPECTED_FOTS_FAILURE (DISPUTED fn-format-integer format-integer-044 21448)
16 EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en152 21558)
17 EXPECTED_FOTS_FAILURE (DISPUTED fn-format-dateTime format-dateTime-en152 21558)
18-EXPECTED_FOTS_FAILURE (DISPUTED prod-AxisStep cbcl-childAxis-001 21620)
19-EXPECTED_FOTS_FAILURE (DISPUTED prod-AxisStep Axes115 21620)
20 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy20 21619)
21 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy21 21619)
22-EXPECTED_FOTS_FAILURE (DISPUTED misc-CombinedErrorCodes XQST0085 21730)
23 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-001 21568)
24 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-003 21568)
25 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-005 21568)
26@@ -150,7 +140,6 @@
27 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-027 21568)
28 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568)
29 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568)
30-EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
31 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-003 21868)
32 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-004 21868)
33 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-005 21868)
34@@ -158,6 +147,8 @@
35 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-028 21868)
36 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-031 21868)
37 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-032 21868)
38+EXPECTED_FOTS_FAILURE (DISPUTED fn-id K2-SeqIDFunc-11 21414)
39+EXPECTED_FOTS_FAILURE (DISPUTED fn-id K2-SeqIDFunc-12 21414)
40
41 # Next three possibly unique to old RQ machine, but they need to be
42 # marked for the RQ to pass.
43@@ -229,7 +220,6 @@
44 EXPECTED_FOTS_FAILURE (fn-string-length fn-string-length-24 0)
45 EXPECTED_FOTS_FAILURE (fn-tokenize fn-tokenize-31 0)
46 EXPECTED_FOTS_FAILURE (fn-tokenize fn-tokenize-32 0)
47-EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-037 0)
48 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-038 0)
49 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-039 0)
50 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-042 0)
51@@ -239,7 +229,6 @@
52 EXPECTED_FOTS_FAILURE (fn-unparsed-text-available fn-unparsed-text-available-036 0)
53 EXPECTED_FOTS_FAILURE (fn-unparsed-text-available fn-unparsed-text-available-037 0)
54 EXPECTED_FOTS_FAILURE (fn-unparsed-text-available fn-unparsed-text-available-038 0)
55-EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-037 0)
56 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-038 0)
57 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-039 0)
58 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-042 0)
59
60=== modified file 'test/fots/ImportFOTS.cmake'
61--- test/fots/ImportFOTS.cmake 2013-04-23 02:39:22 +0000
62+++ test/fots/ImportFOTS.cmake 2013-05-01 19:32:46 +0000
63@@ -19,7 +19,7 @@
64
65
66 # Change this to publish updated FOTS archives
67-SET (FOTS_ARCHIVE "FOTS_230413.tgz")
68+SET (FOTS_ARCHIVE "FOTS_010513.tgz")
69
70 # Change this to modify which elements in FOTS driver results are output
71 # as CDATA
72
73=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
74--- test/fots_driver/FOTSZorbaManifest.xml 2013-04-17 11:11:24 +0000
75+++ test/fots_driver/FOTSZorbaManifest.xml 2013-05-01 19:32:46 +0000
76@@ -10,6 +10,7 @@
77 <dependency type="feature" value="schemaValidation" satisfied="true"/>
78 <dependency type="feature" value="staticTyping" satisfied="false"/>
79 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="true"/> <!-- Is this correct? -->
80+ <dependency type="feature" value="infoset-dtd" satisfied="true"/>
81
82 <!-- We are not interested in running XPath test cases, we only run XQuery test cases -->
83 <dependency type="spec" value="XP10+" satisfied="false"/>
84
85=== modified file 'test/fots_driver/W3C_submission_template.xml'
86--- test/fots_driver/W3C_submission_template.xml 2013-02-04 16:48:16 +0000
87+++ test/fots_driver/W3C_submission_template.xml 2013-05-01 19:32:46 +0000
88@@ -3,15 +3,15 @@
89 <created by="Sorin Nasoi"
90 email="sorin.marian.nasoi_at_gmail.com"
91 organization="FLWOR Foundation"
92- on="2013-01-24"/>
93+ on="2013-04-01"/>
94 <test-run test-suite-version="CVS"
95- date-run="2013-01-24"/>
96+ date-run="2013-04-01"/>
97 <notes/>
98 </submission>
99 <product vendor="FLWOR Foundation"
100- name="Zorba"
101- version="2.8"
102- released="true"
103+ name="Zorba_11424"
104+ version="11424"
105+ released="false"
106 open-source="true"
107 language="XQ30"/>
108 </test-suite-result>
109
110=== modified file 'test/fots_driver/fots-driver.xq'
111--- test/fots_driver/fots-driver.xq 2013-04-30 06:29:23 +0000
112+++ test/fots_driver/fots-driver.xq 2013-05-01 19:32:46 +0000
113@@ -715,8 +715,6 @@
114 then $catalogBaseURI
115 else $tsBaseURI,
116
117- exists(index-of(('fn-id', 'fn-idref', 'app-FunctxFunctx'), $tsName)),
118-
119 $verbose,
120
121 $cliMode,
122@@ -748,8 +746,6 @@
123 : environment is specified in. It is used to calculate the full URI
124 : for the different children of the <environment> that have a @file
125 : attribute.
126- : @param $mayNeedDTDValidation true if the test case may need DTD validation
127- : for the document bound as context item.
128 : @param $verbose if true, the resulting XML tree will contain more details
129 : about the test-case.
130 : @param $cliMode the cli command.
131@@ -767,7 +763,6 @@
132 $FOTSZorbaManifest as document-node(),
133 $env as element(fots:environment)?,
134 $envBaseURI as xs:anyURI?,
135- $mayNeedDTDValidation as xs:boolean,
136 $verbose as xs:boolean,
137 $cliMode as xs:string,
138 $usePlanSerializer as xs:boolean
139@@ -809,7 +804,6 @@
140 $expFailureTC,
141 $ctestMode,
142 $cliMode,
143- $mayNeedDTDValidation,
144 $usePlanSerializer)
145 }
146 };
147@@ -836,8 +830,6 @@
148 : @param $ctestMode true if the known failures are to be reported as 'pass'
149 : instead of 'fail'.
150 : @param $cliMode the cli command.
151- : @param $mayNeedDTDValidation true if the test-case may need DTD validation
152- : for the document bound as context item.
153 : @param $usePlanSerializer if true the plan serializer is used.
154 : @return an XML tree containing the result of running the test-case.
155 :)
156@@ -852,7 +844,6 @@
157 $expFailureTC as element(Test)?,
158 $ctestMode as xs:boolean,
159 $cliMode as xs:string,
160- $mayNeedDTDValidation as xs:boolean,
161 $usePlanSerializer as xs:boolean
162 ) as element(fots:test-case)?
163 {
164@@ -893,24 +884,12 @@
165 "&#xA;"
166 );
167
168- variable $needsDTDValidation :=
169- if (not($mayNeedDTDValidation))
170- then fn:false()
171- else if (($testSetName = 'app-FunctxFunctx') and
172- (xs:string($case/@name) = 'functx-functx-id-from-element-1'))
173- then fn:true()
174- else if (($testSetName = 'fn-id') and
175- starts-with(xs:string($case/@name), 'fn-id-dtd-'))
176- then fn:true()
177- else (($testSetName = 'fn-idref') and
178- starts-with(xs:string($case/@name), 'fn-idref-dtd-'));
179-
180 variable $xqxqQuery := driver:create-XQXQ-query($query,
181 $case,
182 $env,
183 $envBaseURI,
184 $testSetBaseURI,
185- $needsDTDValidation);
186+ $deps);
187
188 (:if $verbose then print the query to a file:)
189 if ($verbose and
190@@ -997,9 +976,9 @@
191 : @param $env the environment.
192 : @param $envBaseURI URI of the environment.
193 : @param $testSetBaseURI the URI of the directory that contains the file of the
194- associated test set.
195- : @param $needsDTDValidation true if the test case needs DTD validation
196- : for the document bound as context item.
197+ : associated test set.
198+ : @param $deps the dependencies that should be checked for given test-case.
199+ : These may be defined at test-set level and/or test-case level.
200 : @return the query that will be evaluated.
201 :)
202 declare %private function driver:create-XQXQ-query(
203@@ -1008,7 +987,7 @@
204 $env as element(fots:environment)?,
205 $envBaseURI as xs:anyURI?,
206 $testSetBaseURI as xs:anyURI,
207- $needsDTDValidation as xs:boolean
208+ $deps as element(fots:dependency)*
209 ) as xs:string
210 {
211 let $resolver as xs:string? := env:resolver($case,
212@@ -1019,6 +998,7 @@
213 $env,
214 $envBaseURI,
215 $testSetBaseURI)
216+ let $needsDTDValidation := exists($deps[@type="feature" and @value="infoset-dtd"])
217 return
218 string-join
219 (

Subscribers

People subscribed via source and target branches