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
1=== modified file 'test/fots/CMakeLists.txt'
2--- test/fots/CMakeLists.txt 2013-06-27 23:16:03 +0000
3+++ test/fots/CMakeLists.txt 2013-07-12 06:44:27 +0000
4@@ -150,8 +150,10 @@
5 EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 1167641)
6 EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 1167641)
7 EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 1167641)
8+EXPECTED_FOTS_FAILURE (fn-format-number cbcl-fn-format-number-003 1200494)
9 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-062 1187685)
10 EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-530 1188329)
11+EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-25 1200498)
12 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
13 EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-23 1187802)
14 EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-25 1187802)
15@@ -229,6 +231,8 @@
16 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-27 1110217)
17 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 1110217)
18 EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 1188302)
19+EXPECTED_FOTS_FAILURE (prod-DirElemConstructor cbcl-directconelem-001 1200498)
20+EXPECTED_FOTS_FAILURE (prod-DirElemConstructor cbcl-directconelem-002 1200498)
21 EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)
22 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-007 1114221)
23 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-008 1114221)
24@@ -273,6 +277,8 @@
25 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-17 1160015)
26 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 1160015)
27 EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-062 1187685)
28+EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-30 1200498)
29+EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-31 1200498)
30 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 1188159)
31 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 1172258)
32 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 1172258)
33@@ -280,6 +286,7 @@
34 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy50 1172258)
35 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy51 1172258)
36 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy59 1172258)
37+EXPECTED_FOTS_FAILURE (prod-WhereClause cbcl-hash-join-3 1200501)
38 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-1-s 1185996)
39 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-2-s 1185996)
40 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 1185996)
41
42=== modified file 'test/fots/ImportFOTS.cmake'
43--- test/fots/ImportFOTS.cmake 2013-06-13 22:10:18 +0000
44+++ test/fots/ImportFOTS.cmake 2013-07-12 06:44:27 +0000
45@@ -19,7 +19,12 @@
46
47
48 # Change this to publish updated FOTS archives
49-SET (FOTS_ARCHIVE "FOTS_130613.tgz")
50+
51+#this is the official QT 1.0 release from 21st June 2013
52+#SET (FOTS_ARCHIVE "QT3_1_0.tgz")
53+
54+#this is the QT CVS trunk version as from 10th July 2013
55+SET (FOTS_ARCHIVE "QT_100713.tgz")
56
57 # Change this to modify which elements in FOTS driver results are output
58 # as CDATA
59
60=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
61--- test/fots_driver/FOTSZorbaManifest.xml 2013-06-05 12:51:21 +0000
62+++ test/fots_driver/FOTSZorbaManifest.xml 2013-07-12 06:44:27 +0000
63@@ -10,6 +10,7 @@
64 <dependency type="feature" value="schemaValidation" satisfied="true"/>
65 <dependency type="feature" value="staticTyping" satisfied="false"/>
66 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
67+ <dependency type="feature" value="typedData" satisfied="true"/>
68
69 <!-- This dependency marks a XPath 1.0 test-case -->
70 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>
71@@ -31,6 +32,7 @@
72 <dependency type="spec" value="XQ10 XP20" satisfied="true"/>
73 <dependency type="spec" value="XQ10+" satisfied="true"/>
74 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>
75+ <dependency type="spec" value="XP20+ XQ10+" satisfied="true"/>
76 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>
77 <dependency type="spec" value="XQ30" satisfied="true"/>
78 <dependency type="spec" value="XQ30 XP30" satisfied="true"/>
79
80=== modified file 'test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml'
81--- test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-06-05 12:51:21 +0000
82+++ test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-07-12 06:44:27 +0000
83@@ -10,6 +10,7 @@
84 <dependency type="feature" value="schemaValidation" satisfied="true"/>
85 <dependency type="feature" value="staticTyping" satisfied="false"/>
86 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
87+ <dependency type="feature" value="typedData" satisfied="true"/>
88
89 <!-- This dependency marks a XPath 1.0 test-case -->
90 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>
91@@ -33,6 +34,7 @@
92 <dependency type="spec" value="XQ10+" satisfied="true"/>
93 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>
94 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>
95+ <dependency type="spec" value="XP20+ XQ10+" satisfied="true"/>
96
97 <!-- We do not run test-cases compatible with XQuery 3.0 meaning XQ30 and XQ30+ -->
98 <dependency type="spec" value="XP30+ XQ30+" satisfied="false"/>
99
100=== modified file 'test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml'
101--- test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-06-05 12:51:21 +0000
102+++ test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-07-12 06:44:27 +0000
103@@ -10,6 +10,7 @@
104 <dependency type="feature" value="schemaValidation" satisfied="true"/>
105 <dependency type="feature" value="staticTyping" satisfied="false"/>
106 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
107+ <dependency type="feature" value="typedData" satisfied="true"/>
108
109 <!-- This dependency marks a XPath 1.0 test-case -->
110 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>
111@@ -34,6 +35,7 @@
112 <dependency type="spec" value="XQ10+" satisfied="true"/>
113 <dependency type="spec" value="XQ10+ XP20+" satisfied="true"/>
114 <dependency type="spec" value="XQ10+ XP30+" satisfied="true"/>
115+ <dependency type="spec" value="XP20+ XQ10+" satisfied="true"/>
116
117 <dependency type="spec" value="XP30+ XQ30+" satisfied="true"/>
118 <dependency type="spec" value="XQ30" satisfied="true"/>

Subscribers

People subscribed via source and target branches