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

Proposed by Sorin Marian Nasoi on 2012-08-27
Status: Merged
Approved by: Sorin Marian Nasoi on 2012-12-14
Approved revision: 11004
Merged at revision: 11147
Proposed branch: lp:~zorba-coders/zorba/fix_bug_867094
Merge into: lp:zorba
Diff against target: 217 lines (+65/-73)
5 files modified
test/rbkt/Queries/CMakeLists.txt (+0/-5)
test/rbkt/Queries/w3c_known_failures_XQueryX.txt (+61/-64)
test/rbkt/Scripts/w3c/Readme.txt (+1/-1)
test/rbkt/testdriver_mt.cpp (+2/-2)
test/update/Scripts/Readme.txt (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_867094
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve on 2012-12-14
Chris Hillery 2012-08-27 Approve on 2012-12-14
Review via email: mp+121405@code.launchpad.net

Commit message

Fixed bug lp:867094.

Description of the change

Fixed bug lp:867094.

To post a comment you must log in.
review: Approve
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/fix_bug_867094 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job fix_bug_867094-2012-12-14T07-08-57.704Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/fix_bug_867094 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job fix_bug_867094-2012-12-14T08-24-55.154Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_867094-2012-12-14T09-15-51.708Z 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/rbkt/Queries/CMakeLists.txt'
2--- test/rbkt/Queries/CMakeLists.txt 2012-11-06 10:11:37 +0000
3+++ test/rbkt/Queries/CMakeLists.txt 2012-12-14 07:43:24 +0000
4@@ -230,7 +230,6 @@
5 ####
6 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
7
8- #EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
9 EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
10
11 IF (NOT ZORBA_WITH_BIG_INTEGER)
12@@ -263,10 +262,6 @@
13 EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015 3355019)
14 ENDIF (ZORBA_TEST_XQUERYX)
15
16- #this is marked as expected failure because the RQ uses XQTS_1_0_3. In that version the expected result is err:FODC0004 instead of err:FODC0002.
17- #W3C has changed the expected result for this test in the meantime: please see http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542
18- #EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2 882002)
19-
20 ENDIF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
21
22
23
24=== modified file 'test/rbkt/Queries/w3c_known_failures_XQueryX.txt'
25--- test/rbkt/Queries/w3c_known_failures_XQueryX.txt 2012-01-26 09:38:39 +0000
26+++ test/rbkt/Queries/w3c_known_failures_XQueryX.txt 2012-12-14 07:43:24 +0000
27@@ -1,88 +1,85 @@
28-test/rbkt/w3c_testsuite/XQueryX/SchemaValidation/ValidateExpression/validateexpr-28
29-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-02
30-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-01
31-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-WhereExpr001
32+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFunctions/ST-Data001
33 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes012
34 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes011
35+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015
36 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes013
37 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes014
38-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015
39-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFunctions/ST-Data001
40-test/rbkt/w3c_testsuite/XQueryX/Basics/EQNames/eqname-013
41-test/rbkt/w3c_testsuite/XQueryX/PathExpr/Steps/Steps-leading-lone-slash-8a
42-test/rbkt/w3c_testsuite/XQueryX/SchemaImport/SchemaImportProlog/modules-schema-context
43+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-WhereExpr001
44+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-01
45+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-02
46+test/rbkt/w3c_testsuite/XQueryX/SchemaValidation/ValidateExpression/validateexpr-28
47+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
48+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
49+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10
50+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-009
51+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-008
52 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-021
53-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-008
54-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-049
55-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-024
56-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-913
57 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-046
58-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-030
59-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-047
60-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-914
61-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-038
62+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-039
63+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-037
64 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-007
65+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-913
66 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-015
67-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-009
68+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-904
69+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-024
70+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-017
71+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-914
72+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-049
73+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-018
74+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-047
75+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-028
76 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-036
77-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-028
78-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-017
79+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-038
80 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-029
81-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-018
82 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-031
83-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-039
84-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-037
85-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-904
86-test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
87-test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
88-test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10
89-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-005
90-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-006
91-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-903
92-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-003
93-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-007
94-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-001
95-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-901
96-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-002
97-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-004
98-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-902
99-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-003
100-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-002
101-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-903
102-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-901
103-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-902
104-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-004
105-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-005
106+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-030
107+test/rbkt/w3c_testsuite/XQueryX/exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-22
108+test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemWhitespace/K2-DirectConElemWhitespace-25
109+test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-27
110+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5
111+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
112+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch08
113+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09
114+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
115+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
116+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-004
117+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-009
118 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-008
119 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-001
120+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-002
121 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-003
122-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-002
123-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-004
124-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-009
125 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-005
126-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-005
127+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-004
128+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-003
129 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-002
130-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-004
131 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-001
132-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-003
133-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-901
134+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-005
135 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-008
136-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-005
137 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-006
138-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-007
139+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-001
140 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-003
141+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-901
142 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-002
143+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-007
144 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-902
145-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-001
146+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-005
147+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-902
148+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-001
149+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-002
150+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-003
151+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-005
152+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-006
153+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-004
154+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-007
155+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-901
156+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-903
157+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-902
158+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-003
159+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-903
160+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-004
161+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-901
162+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-002
163+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-005
164 test/rbkt/w3c_testsuite/XQueryX/FunctX/functx-fn-tokenize/functx-fn-tokenize-7
165 test/rbkt/w3c_testsuite/XQueryX/FunctX/functx-fn-tokenize/functx-fn-tokenize-all
166-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5
167-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch08
168-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09
169-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
170-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
171-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
172-test/rbkt/w3c_testsuite/XQueryX/exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-22
173-test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-27
174-test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemWhitespace/K2-DirectConElemWhitespace-25
175-
176+test/rbkt/w3c_testsuite/XQueryX/Basics/EQNames/eqname-013
177
178=== modified file 'test/rbkt/Scripts/w3c/Readme.txt'
179--- test/rbkt/Scripts/w3c/Readme.txt 2012-09-19 21:16:15 +0000
180+++ test/rbkt/Scripts/w3c/Readme.txt 2012-12-14 07:43:24 +0000
181@@ -19,7 +19,7 @@
182 ZORBA_XQUERYX=ON
183 ZORBA_TEST_XQUERYX=ON
184 ZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON
185- All these options are set to OFF by default.
186+ ZORBA_WITH_JSON=OFF
187
188 1. Import XQTS/XQFTTS.
189
190
191=== modified file 'test/rbkt/testdriver_mt.cpp'
192--- test/rbkt/testdriver_mt.cpp 2012-09-19 21:16:15 +0000
193+++ test/rbkt/testdriver_mt.cpp 2012-12-14 07:43:24 +0000
194@@ -953,9 +953,9 @@
195 exit(2);
196 }
197 #if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
198- queries.theQueriesDir = path.native_directory_string();
199+ queries.theQueriesDir = path.file_string();
200 #else
201- queries.theQueriesDir = path.parent_path().generic_string();
202+ queries.theQueriesDir = path.generic_string();
203 #endif
204
205 #if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
206
207=== modified file 'test/update/Scripts/Readme.txt'
208--- test/update/Scripts/Readme.txt 2012-09-19 21:16:15 +0000
209+++ test/update/Scripts/Readme.txt 2012-12-14 07:43:24 +0000
210@@ -19,7 +19,7 @@
211 ZORBA_XQUERYX=ON
212 ZORBA_TEST_XQUERYX=ON
213 ZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON
214- All these options are set to OFF by default.
215+ ZORBA_WITH_JSON=OFF
216
217 1. Import XQUTS.
218

Subscribers

People subscribed via source and target branches