Zorba

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

  1. update_format_integer_settings
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 11309
Merged at revision: 11342
Proposed branch: lp:~zorba-coders/zorba/update_format_integer_settings
Merge into: lp:zorba
Diff against target: 80 lines (+16/-15)
2 files modified
test/fots/CMakeLists.txt (+3/-6)
test/fots_driver/FOTSZorbaManifest.xml (+13/-9)
To merge this branch: bzr merge lp:~zorba-coders/zorba/update_format_integer_settings
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve
Paul J. Lucas Approve
Review via email: mp+156702@code.launchpad.net

Commit message

Updated FOTSZorbaManifest.xml for the fn:format-integer.

Description of the change

Updated FOTSZorbaManifest.xml for the fn:format-integer.

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/update_format_integer_settings-2013-04-02T22-33-40.069Z/log.html

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

Validation queue job update_format_integer_settings-2013-04-02T22-33-40.069Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Paul J. Lucas (paul-lucas) wrote :

Why is calendar CB set to true? Zorba doesn't support that calendar. Right now, we support only AD and ISO.

review: Needs Fixing
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

> Why is calendar CB set to true? Zorba doesn't support that calendar. Right
> now, we support only AD and ISO.
Fixed: please note that there are 2 additional failures because the test cases are wrong in FOTS:
https://www.w3.org/Bugs/Public/show_bug.cgi?id=21558

Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in test/fots/CMakeLists.txt

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

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in test/fots/CMakeLists.txt

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/update_format_integer_settings-2013-04-03T15-05-43.423Z/log.html

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

The attempt to merge lp:~zorba-coders/zorba/update_format_integer_settings 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
  update_format_integer_settings-2013-04-03T15-05-43.423Z 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

lp:~zorba-coders/zorba/update_format_integer_settings updated
11308. By Sorin Marian Nasoi <email address hidden>

Merged lp:zorba trunk.

11309. By Sorin Marian Nasoi <email address hidden>

removed "EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-005 0)".

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/update_format_integer_settings-2013-04-04T11-54-43.209Z/log.html

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

Validation queue job update_format_integer_settings-2013-04-04T11-54-43.209Z 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-04-03 09:15:15 +0000
3+++ test/fots/CMakeLists.txt 2013-04-04 11:54:31 +0000
4@@ -103,9 +103,6 @@
5 EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976 1070533)
6 EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00976a 1070533)
7 EXPECTED_FOTS_FAILURE (CRASH fn-unparsed-text-lines fn-unparsed-text-lines-052 1123835)
8-EXPECTED_FOTS_FAILURE (CRASH prod-InstanceofExpr instanceof139 1160559) # failing but not crushing
9-#EXPECTED_FOTS_FAILURE (CRASH prod-CastExpr.schema CastAs-UnionType-26 1160559)
10-#EXPECTED_FOTS_FAILURE (CRASH prod-CastExpr.schema CastAs-UnionType-30 1160559)
11
12 # Next three possibly unique to old RQ machine, but they need to be
13 # marked for the RQ to pass.
14@@ -148,12 +145,11 @@
15 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en132 0)
16 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en133 0)
17 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en134 0)
18+EXPECTED_FOTS_FAILURE (fn-format-date format-date-en152 21558)
19 EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-006 0)
20 EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-011 0)
21+EXPECTED_FOTS_FAILURE (fn-format-dateTime format-dateTime-en152 21558)
22 EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-044 1162631)
23-EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-049 0)
24-EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-050 0)
25-EXPECTED_FOTS_FAILURE (fn-format-integer format-integer-052 0)
26 EXPECTED_FOTS_FAILURE (fn-format-number numberformat14 0)
27 EXPECTED_FOTS_FAILURE (fn-format-number numberformat15 0)
28 EXPECTED_FOTS_FAILURE (fn-format-number numberformat34 0)
29@@ -437,6 +433,7 @@
30 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
31 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
32 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)
33+EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof139 1160559)
34 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr cbcl-instance-of-001 0)
35 EXPECTED_FOTS_FAILURE (prod-LetClause LetExpr020a 0)
36 EXPECTED_FOTS_FAILURE (prod-Literal Literals056a 0)
37
38=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
39--- test/fots_driver/FOTSZorbaManifest.xml 2013-03-29 08:33:37 +0000
40+++ test/fots_driver/FOTSZorbaManifest.xml 2013-04-04 11:54:31 +0000
41@@ -35,26 +35,30 @@
42 <dependency type="xml-version" value="1.0:5+ 1.1" satisfied="false"/>
43 <dependency type="xml-version" value="1.1" satisfied="false"/>
44
45- <dependency type="language" value="de" satisfied="false"/> <!-- Is this correct? -->
46+ <dependency type="language" value="de" satisfied="false"/>
47 <dependency type="language" value="en" satisfied="true"/>
48- <dependency type="language" value="xib" satisfied="false"/> <!-- Is this correct? -->
49+ <dependency type="language" value="xib" satisfied="false"/>
50
51- <!-- Are these correct? -->
52- <dependency type="limits" value="year_lt_0" satisfied="true"/>
53- <dependency type="calendar" value="CB" satisfied="true"/>
54- <dependency type="format-integer-sequence" value="Α" satisfied="true"/>
55- <dependency type="format-integer-sequence" value="α" satisfied="true"/>
56+ <dependency type="format-integer-sequence" value="Α" satisfied="false"/>
57+ <dependency type="format-integer-sequence" value="α" satisfied="false"/>
58 <dependency type="format-integer-sequence" value="١" satisfied="true"/>
59 <dependency type="format-integer-sequence" value="①" satisfied="true"/>
60 <dependency type="format-integer-sequence" value="⑴" satisfied="true"/>
61 <dependency type="format-integer-sequence" value="⒈" satisfied="true"/>
62- <dependency type="format-integer-sequence" value="一" satisfied="true"/>
63- <dependency type="format-integer-sequence" value="ﯴ" satisfied="true"/>
64+ <dependency type="format-integer-sequence" value="一" satisfied="false"/>
65+ <dependency type="format-integer-sequence" value="ﯴ" satisfied="false"/>
66+
67 <dependency type="default-language" value="en" satisfied="true"/>
68 <dependency type="unicode-normalization-form" value="FULLY-NORMALIZED" satisfied="true"/>
69 <dependency type="unicode-normalization-form" value="NFD" satisfied="true"/>
70 <dependency type="unicode-normalization-form" value="NFKC" satisfied="true"/>
71 <dependency type="unicode-normalization-form" value="NFKD" satisfied="true"/>
72+ <dependency type="calendar" value="CB" satisfied="false"/>
73+
74 <dependency type="xsd-version" value="1.0" satisfied="false"/>
75 <dependency type="xsd-version" value="1.1" satisfied="true"/>
76+
77+
78+ <!-- Are these correct? -->
79+ <dependency type="limits" value="year_lt_0" satisfied="true"/>
80 </test-suite-result>

Subscribers

People subscribed via source and target branches