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

Proposed by Sorin Marian Nasoi on 2013-05-30
Status: Merged
Approved by: Sorin Marian Nasoi on 2013-05-30
Approved revision: 11486
Merged at revision: 11483
Proposed branch: lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_30th
Merge into: lp:zorba
Diff against target: 126 lines (+26/-32)
5 files modified
test/fots/CMakeLists.txt (+16/-31)
test/fots/ImportFOTS.cmake (+1/-1)
test/fots_driver/FOTSZorbaManifest.xml (+3/-0)
test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml (+3/-0)
test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml (+3/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_May_30th
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve on 2013-05-30
Chris Hillery Approve on 2013-05-30
Review via email: mp+166592@code.launchpad.net

Commit message

- bumped FOTS to May 30th
- removed DISPUTED test-cases related to W3C bug #21868
- set the newly added 'serialization' dependency to false because Zorba does not support the option to set the serialization parameters in the query prolog
- added lp:1185989 for all test-cases that end in Seg Fault on Fedora 64 bit

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

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job bump_FOTS_snapshot_May_30th-2013-05-30T20-12-42.029Z
  is finished. The final status was:

  3 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/bump_FOTS_snapshot_May_30th into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job bump_FOTS_snapshot_May_30th-2013-05-30T20-44-41.651Z
  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 :

Validation queue job bump_FOTS_snapshot_May_30th-2013-05-30T22-01-04.349Z 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-28 19:57:02 +0000
3+++ test/fots/CMakeLists.txt 2013-05-30 22:01:25 +0000
4@@ -114,44 +114,21 @@
5 EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976 1070533)
6 EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976a 1070533)
7 # This test-cases SEG FAULT on Fedora x64 bit
8-#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-011 0)
9-#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-optimizations-1 0)
10-#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-optimizations-2 0)
11-#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-spec-example-4 0)
12-#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-nest-1 0)
13-#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-nest-2 0)
14+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-005 1185989)
15+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-function-result-type-1 1185989)
16+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-011 1185989)
17+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-optimizations-1 1185989)
18+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-optimizations-2 1185989)
19+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-spec-example-4 1185989)
20+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-nest-1 1185989)
21+#EXPECTED_FOTS_FAILURE (CRASH prod-TryCatchExpr try-catch-nest-2 1185989)
22
23 #"disputed" tests. These test are run but marked as 'pass' by FOTS driver.
24 #All these entries should have a *valid* opened bug number from W3C bugzilla.
25-EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-003 21868)
26 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-004 21868)
27 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-005 21868)
28-EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-026 21868)
29-EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-028 21868)
30 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-031 21868)
31 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-032 21868)
32-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-1 21868)
33-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-2 21868)
34-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-4 21868)
35-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-18 21868)
36-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-19a 21868)
37-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-19b 21868)
38-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-19c 21868)
39-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-22 21868)
40-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-25 21868)
41-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-26 21868)
42-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-27 21868)
43-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-28 21868)
44-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-29 21868)
45-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-30 21868)
46-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-33 21868)
47-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-34 21868)
48-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-35 21868)
49-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-36 21868)
50-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-37 21868)
51-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-38 21868)
52-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-39 21868)
53-EXPECTED_FOTS_FAILURE (DISPUTED misc-Serialization Serialization-html-40 21868)
54 EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDecl.external K2-ExternalVariablesWith-22 21960)
55
56 # Next three possibly unique to old RQ machine, but they need to be
57@@ -317,6 +294,14 @@
58 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-18 0)
59 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)
60 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)
61+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-1-s 1185996)
62+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-2-s 1185996)
63+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 1185996)
64+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-2-s 1185996)
65+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-schema-aware-5-s 1185996)
66+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-3-s 1185996)
67+EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)
68+EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-026a 0)
69 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 0)
70 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 0)
71 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy49 0)
72
73=== modified file 'test/fots/ImportFOTS.cmake'
74--- test/fots/ImportFOTS.cmake 2013-05-22 17:11:19 +0000
75+++ test/fots/ImportFOTS.cmake 2013-05-30 22:01:25 +0000
76@@ -19,7 +19,7 @@
77
78
79 # Change this to publish updated FOTS archives
80-SET (FOTS_ARCHIVE "FOTS_220513.tgz")
81+SET (FOTS_ARCHIVE "FOTS_300513.tgz")
82
83 # Change this to modify which elements in FOTS driver results are output
84 # as CDATA
85
86=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
87--- test/fots_driver/FOTSZorbaManifest.xml 2013-05-01 22:22:26 +0000
88+++ test/fots_driver/FOTSZorbaManifest.xml 2013-05-30 22:01:25 +0000
89@@ -11,6 +11,9 @@
90 <dependency type="feature" value="staticTyping" satisfied="false"/>
91 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="true"/> <!-- Is this correct? -->
92 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
93+
94+ <!-- set to 'false' because Zorba does not support setting serialization params in the query prolog-->
95+ <dependency type="feature" value="serialization" satisfied="false"/>
96
97 <!-- We are not interested in running XPath test cases, we only run XQuery test cases -->
98 <dependency type="spec" value="XP10+" satisfied="false"/>
99
100=== modified file 'test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml'
101--- test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-05-20 18:12:16 +0000
102+++ test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-05-30 22:01:25 +0000
103@@ -12,6 +12,9 @@
104 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="true"/> <!-- Is this correct? -->
105 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
106
107+ <!-- set to 'false' because Zorba does not support setting serialization params in the query prolog-->
108+ <dependency type="feature" value="serialization" satisfied="false"/>
109+
110 <!-- We are not running test-cases written for XPath -->
111 <dependency type="spec" value="XP10+" satisfied="false"/>
112 <dependency type="spec" value="XP20" satisfied="false"/>
113
114=== modified file 'test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml'
115--- test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-05-20 18:12:16 +0000
116+++ test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-05-30 22:01:25 +0000
117@@ -12,6 +12,9 @@
118 <dependency type="feature" value="xpath-1.0-compatibility" satisfied="true"/> <!-- Is this correct? -->
119 <dependency type="feature" value="infoset-dtd" satisfied="true"/>
120
121+ <!-- set to 'false' because Zorba does not support setting serialization params in the query prolog-->
122+ <dependency type="feature" value="serialization" satisfied="false"/>
123+
124 <!-- We are not running test-cases written for XPath -->
125 <dependency type="spec" value="XP10+" satisfied="false"/>
126 <dependency type="spec" value="XP20" satisfied="false"/>

Subscribers

People subscribed via source and target branches