Zorba

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

  1. bump_QT_snapshot
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Merged at revision: 11552
Proposed branch: lp:~zorba-coders/zorba/bump_QT_snapshot
Merge into: lp:zorba
Diff against target: 118 lines (+19/-1)
5 files modified
test/fots/CMakeLists.txt (+7/-0)
test/fots/ImportFOTS.cmake (+6/-1)
test/fots_driver/FOTSZorbaManifest.xml (+2/-0)
test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml (+2/-0)
test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml (+2/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bump_QT_snapshot
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Sorin Marian Nasoi Approve
Review via email: mp+174341@code.launchpad.net

Commit message

- bumped QT test-suite version

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 the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot/+merge/174341

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot/+merge/174341

Stage "TestZorbaUbuntu" failed.
5 tests failed (8344 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/73/testReport/ to view the results.

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

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot/+merge/174341

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot/+merge/174341 :
Votes: {'Approve': 1}

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot/+merge/174341

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/26/console to view the results.

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

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot/+merge/174341

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-06-27 23:16:03 +0000
+++ test/fots/CMakeLists.txt 2013-07-12 06:44:27 +0000
@@ -150,8 +150,10 @@
150EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 1167641)150EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 1167641)
151EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 1167641)151EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 1167641)
152EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 1167641)152EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 1167641)
153EXPECTED_FOTS_FAILURE (fn-format-number cbcl-fn-format-number-003 1200494)
153EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 1187685)154EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 1187685)
154EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-530 1188329)155EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-530 1188329)
156EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-25 1200498)
155EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)157EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
156EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-23 1187802)158EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-23 1187802)
157EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-25 1187802)159EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-25 1187802)
@@ -229,6 +231,8 @@
229EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-27 1110217)231EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-27 1110217)
230EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 1110217)232EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 1110217)
231EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 1188302)233EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 1188302)
234EXPECTED_FOTS_FAILURE (prod-DirElemConstructor cbcl-directconelem-001 1200498)
235EXPECTED_FOTS_FAILURE (prod-DirElemConstructor cbcl-directconelem-002 1200498)
232EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)236EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)
233EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-007 1114221)237EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-007 1114221)
234EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-008 1114221)238EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-008 1114221)
@@ -273,6 +277,8 @@
273EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-17 1160015)277EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-17 1160015)
274EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 1160015)278EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 1160015)
275EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-062 1187685)279EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-062 1187685)
280EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-30 1200498)
281EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-31 1200498)
276EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 1188159)282EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 1188159)
277EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 1172258)283EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 1172258)
278EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 1172258)284EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 1172258)
@@ -280,6 +286,7 @@
280EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy50 1172258)286EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy50 1172258)
281EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy51 1172258)287EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy51 1172258)
282EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy59 1172258)288EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy59 1172258)
289EXPECTED_FOTS_FAILURE (prod-WhereClause cbcl-hash-join-3 1200501)
283EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-1-s 1185996)290EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-1-s 1185996)
284EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-2-s 1185996)291EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-2-s 1185996)
285EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 1185996)292EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 1185996)
286293
=== modified file 'test/fots/ImportFOTS.cmake'
--- test/fots/ImportFOTS.cmake 2013-06-13 22:10:18 +0000
+++ test/fots/ImportFOTS.cmake 2013-07-12 06:44:27 +0000
@@ -19,7 +19,12 @@
1919
2020
21# Change this to publish updated FOTS archives21# Change this to publish updated FOTS archives
22SET (FOTS_ARCHIVE "FOTS_130613.tgz")22
23#this is the official QT 1.0 release from 21st June 2013
24#SET (FOTS_ARCHIVE "QT3_1_0.tgz")
25
26#this is the QT CVS trunk version as from 10th July 2013
27SET (FOTS_ARCHIVE "QT_100713.tgz")
2328
24# Change this to modify which elements in FOTS driver results are output29# Change this to modify which elements in FOTS driver results are output
25# as CDATA30# as CDATA
2631
=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
--- test/fots_driver/FOTSZorbaManifest.xml 2013-06-05 12:51:21 +0000
+++ test/fots_driver/FOTSZorbaManifest.xml 2013-07-12 06:44:27 +0000
@@ -10,6 +10,7 @@
10 <dependency type="feature" value="schemaValidation" satisfied="true"/>10 <dependency type="feature" value="schemaValidation" satisfied="true"/>
11 <dependency type="feature" value="staticTyping" satisfied="false"/>11 <dependency type="feature" value="staticTyping" satisfied="false"/>
12 <dependency type="feature" value="infoset-dtd" satisfied="true"/>12 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
13 <dependency type="feature" value="typedData" satisfied="true"/>
1314
14 <!-- This dependency marks a XPath 1.0 test-case -->15 <!-- This dependency marks a XPath 1.0 test-case -->
15 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>16 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>
@@ -31,6 +32,7 @@
31 <dependency type="spec" value="XQ10 XP20" satisfied="true"/>32 <dependency type="spec" value="XQ10 XP20" satisfied="true"/>
32 <dependency type="spec" value="XQ10+" satisfied="true"/>33 <dependency type="spec" value="XQ10+" satisfied="true"/>
33 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>34 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>
35 <dependency type="spec" value="XP20+ XQ10+" satisfied="true"/>
34 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>36 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>
35 <dependency type="spec" value="XQ30" satisfied="true"/>37 <dependency type="spec" value="XQ30" satisfied="true"/>
36 <dependency type="spec" value="XQ30 XP30" satisfied="true"/>38 <dependency type="spec" value="XQ30 XP30" satisfied="true"/>
3739
=== modified file 'test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml'
--- test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-06-05 12:51:21 +0000
+++ test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-07-12 06:44:27 +0000
@@ -10,6 +10,7 @@
10 <dependency type="feature" value="schemaValidation" satisfied="true"/>10 <dependency type="feature" value="schemaValidation" satisfied="true"/>
11 <dependency type="feature" value="staticTyping" satisfied="false"/>11 <dependency type="feature" value="staticTyping" satisfied="false"/>
12 <dependency type="feature" value="infoset-dtd" satisfied="true"/>12 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
13 <dependency type="feature" value="typedData" satisfied="true"/>
1314
14 <!-- This dependency marks a XPath 1.0 test-case -->15 <!-- This dependency marks a XPath 1.0 test-case -->
15 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>16 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>
@@ -33,6 +34,7 @@
33 <dependency type="spec" value="XQ10+" satisfied="true"/>34 <dependency type="spec" value="XQ10+" satisfied="true"/>
34 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>35 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>
35 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>36 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>
37 <dependency type="spec" value="XP20+ XQ10+" satisfied="true"/>
36 38
37 <!-- We do not run test-cases compatible with XQuery 3.0 meaning XQ30 and XQ30+ -->39 <!-- We do not run test-cases compatible with XQuery 3.0 meaning XQ30 and XQ30+ -->
38 <dependency type="spec" value="XP30+ XQ30+" satisfied="false"/> 40 <dependency type="spec" value="XP30+ XQ30+" satisfied="false"/>
3941
=== modified file 'test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml'
--- test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-06-05 12:51:21 +0000
+++ test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-07-12 06:44:27 +0000
@@ -10,6 +10,7 @@
10 <dependency type="feature" value="schemaValidation" satisfied="true"/>10 <dependency type="feature" value="schemaValidation" satisfied="true"/>
11 <dependency type="feature" value="staticTyping" satisfied="false"/>11 <dependency type="feature" value="staticTyping" satisfied="false"/>
12 <dependency type="feature" value="infoset-dtd" satisfied="true"/>12 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
13 <dependency type="feature" value="typedData" satisfied="true"/>
1314
14 <!-- This dependency marks a XPath 1.0 test-case -->15 <!-- This dependency marks a XPath 1.0 test-case -->
15 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>16 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>
@@ -34,6 +35,7 @@
34 <dependency type="spec" value="XQ10+" satisfied="true"/>35 <dependency type="spec" value="XQ10+" satisfied="true"/>
35 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>36 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>
36 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>37 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>
38 <dependency type="spec" value="XP20+ XQ10+" satisfied="true"/>
3739
38 <dependency type="spec" value="XP30+ XQ30+" satisfied="true"/> 40 <dependency type="spec" value="XP30+ XQ30+" satisfied="true"/>
39 <dependency type="spec" value="XQ30" satisfied="true"/>41 <dependency type="spec" value="XQ30" satisfied="true"/>

Subscribers

People subscribed via source and target branches