Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11035
Merged at revision: 11185
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 162 lines (+30/-20)
21 files modified
src/diagnostics/xquery_diagnostics.h (+2/-2)
test/rbkt/ExpQueryResults/zorba/numerics/INF-1.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/numerics/NaN.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/numerics/infinity0.xml.res (+0/-1)
test/rbkt/ExpQueryResults/zorba/numerics/overflow-1.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/numerics/overflow-2.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/numerics/overflow-3.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/numerics/overflow-4.xml.res (+1/-0)
test/rbkt/Queries/zorba/numerics/INF-1.xq (+6/-0)
test/rbkt/Queries/zorba/numerics/NaN.xq (+4/-0)
test/rbkt/Queries/zorba/numerics/format-number1.xq (+0/-2)
test/rbkt/Queries/zorba/numerics/format-number2.xq (+0/-2)
test/rbkt/Queries/zorba/numerics/infinity0.xq (+0/-13)
test/rbkt/Queries/zorba/numerics/overflow-1.spec (+2/-0)
test/rbkt/Queries/zorba/numerics/overflow-1.xq (+1/-0)
test/rbkt/Queries/zorba/numerics/overflow-2.spec (+2/-0)
test/rbkt/Queries/zorba/numerics/overflow-2.xq (+1/-0)
test/rbkt/Queries/zorba/numerics/overflow-3.spec (+2/-0)
test/rbkt/Queries/zorba/numerics/overflow-3.xq (+1/-0)
test/rbkt/Queries/zorba/numerics/overflow-4.spec (+2/-0)
test/rbkt/Queries/zorba/numerics/overflow-4.xq (+1/-0)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+142823@code.launchpad.net

Commit message

1. Removed infinity0.xq test since it tests too many things in a single test.
2. Added several smaller infinity/overflow tests in its place.

Description of the change

1. Removed infinity0.xq test since it tests too many things in a single test.
2. Added several smaller infinity/overflow tests in its place.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
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/pjl-misc-2013-01-11T02-12-50.591Z/log.html

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

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

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/pjl-misc-2013-01-11T09-45-52.881Z/log.html

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

The attempt to merge lp:~paul-lucas/zorba/pjl-misc 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 pjl-misc-2013-01-11T09-45-52.881Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

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

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/pjl-misc-2013-01-11T15-52-51.499Z/log.html

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

Validation queue job pjl-misc-2013-01-11T15-52-51.499Z 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. Got: 1 Approve, 1 Pending.

lp:~paul-lucas/zorba/pjl-misc updated
11034. By Paul J. Lucas

Comment fix.

11035. By Paul J. Lucas

Merge from trunk.

Revision history for this message
Matthias Brantner (matthias-brantner) :
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/pjl-misc-2013-01-15T18-13-45.859Z/log.html

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

Validation queue job pjl-misc-2013-01-15T18-13-45.859Z 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 'src/diagnostics/xquery_diagnostics.h'
2--- src/diagnostics/xquery_diagnostics.h 2012-09-19 21:16:15 +0000
3+++ src/diagnostics/xquery_diagnostics.h 2013-01-15 18:13:26 +0000
4@@ -95,8 +95,8 @@
5 /**
6 * Adds a warning to the list of warnings.
7 *
8- * @param exception The exception to add. The %XQueryDiagnostics takes
9- * ownership of the exception.
10+ * @param warning The warning to add. The %XQueryDiagnostics takes ownership
11+ * of the warning.
12 */
13 void add_warning( XQueryWarning const *warning ) {
14 warnings_.push_back( warning );
15
16=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/INF-1.xml.res'
17--- test/rbkt/ExpQueryResults/zorba/numerics/INF-1.xml.res 1970-01-01 00:00:00 +0000
18+++ test/rbkt/ExpQueryResults/zorba/numerics/INF-1.xml.res 2013-01-15 18:13:26 +0000
19@@ -0,0 +1,1 @@
20+-INF INF -INF INF
21
22=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/NaN.xml.res'
23--- test/rbkt/ExpQueryResults/zorba/numerics/NaN.xml.res 1970-01-01 00:00:00 +0000
24+++ test/rbkt/ExpQueryResults/zorba/numerics/NaN.xml.res 2013-01-15 18:13:26 +0000
25@@ -0,0 +1,1 @@
26+NaN NaN
27
28=== removed file 'test/rbkt/ExpQueryResults/zorba/numerics/infinity0.xml.res'
29--- test/rbkt/ExpQueryResults/zorba/numerics/infinity0.xml.res 2012-09-19 21:16:15 +0000
30+++ test/rbkt/ExpQueryResults/zorba/numerics/infinity0.xml.res 1970-01-01 00:00:00 +0000
31@@ -1,1 +0,0 @@
32-INF -INF NaN -INF INF 1.0E200 INF -INF NaN INF -INF
33
34=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-1.xml.res'
35--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-1.xml.res 1970-01-01 00:00:00 +0000
36+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-1.xml.res 2013-01-15 18:13:26 +0000
37@@ -0,0 +1,1 @@
38+INF
39
40=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-2.xml.res'
41--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-2.xml.res 1970-01-01 00:00:00 +0000
42+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-2.xml.res 2013-01-15 18:13:26 +0000
43@@ -0,0 +1,1 @@
44+-INF
45
46=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-3.xml.res'
47--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-3.xml.res 1970-01-01 00:00:00 +0000
48+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-3.xml.res 2013-01-15 18:13:26 +0000
49@@ -0,0 +1,1 @@
50+INF
51
52=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-4.xml.res'
53--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-4.xml.res 1970-01-01 00:00:00 +0000
54+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-4.xml.res 2013-01-15 18:13:26 +0000
55@@ -0,0 +1,1 @@
56+-INF
57
58=== added file 'test/rbkt/Queries/zorba/numerics/INF-1.xq'
59--- test/rbkt/Queries/zorba/numerics/INF-1.xq 1970-01-01 00:00:00 +0000
60+++ test/rbkt/Queries/zorba/numerics/INF-1.xq 2013-01-15 18:13:26 +0000
61@@ -0,0 +1,6 @@
62+(
63+ xs:float("-INF"),
64+ xs:float("INF"),
65+ xs:double("-INF"),
66+ xs:double("INF")
67+)
68
69=== added file 'test/rbkt/Queries/zorba/numerics/NaN.xq'
70--- test/rbkt/Queries/zorba/numerics/NaN.xq 1970-01-01 00:00:00 +0000
71+++ test/rbkt/Queries/zorba/numerics/NaN.xq 2013-01-15 18:13:26 +0000
72@@ -0,0 +1,4 @@
73+(
74+ xs:float("NaN"),
75+ xs:double("NaN")
76+)
77
78=== modified file 'test/rbkt/Queries/zorba/numerics/format-number1.xq'
79--- test/rbkt/Queries/zorba/numerics/format-number1.xq 2012-09-19 21:16:15 +0000
80+++ test/rbkt/Queries/zorba/numerics/format-number1.xq 2013-01-15 18:13:26 +0000
81@@ -1,3 +1,1 @@
82 fn:format-number(1, ""), fn:format-number(12, "0")
83-
84-
85
86=== modified file 'test/rbkt/Queries/zorba/numerics/format-number2.xq'
87--- test/rbkt/Queries/zorba/numerics/format-number2.xq 2012-09-19 21:16:15 +0000
88+++ test/rbkt/Queries/zorba/numerics/format-number2.xq 2013-01-15 18:13:26 +0000
89@@ -1,3 +1,1 @@
90 fn:format-number((), "0")
91-
92-
93
94=== removed file 'test/rbkt/Queries/zorba/numerics/infinity0.xq'
95--- test/rbkt/Queries/zorba/numerics/infinity0.xq 2012-09-19 21:16:15 +0000
96+++ test/rbkt/Queries/zorba/numerics/infinity0.xq 1970-01-01 00:00:00 +0000
97@@ -1,13 +0,0 @@
98-(
99- xs:float("1000000000000000000000000000000000000000000000000000000"),
100- xs:float("-100000000000000000000000000000000000000000000000000000"),
101- xs:float("NaN"),
102- xs:float("-INF"),
103- xs:float("INF"),
104- xs:double("1E200"),
105- xs:double("1E1000"),
106- xs:double("-1E1000"),
107- xs:double("NaN"),
108- xs:double("INF"),
109- xs:double("-INF")
110-)
111
112=== added file 'test/rbkt/Queries/zorba/numerics/overflow-1.spec'
113--- test/rbkt/Queries/zorba/numerics/overflow-1.spec 1970-01-01 00:00:00 +0000
114+++ test/rbkt/Queries/zorba/numerics/overflow-1.spec 2013-01-15 18:13:26 +0000
115@@ -0,0 +1,2 @@
116+Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/numerics/overflow-1.xml.res
117+Error: http://www.w3.org/2005/xqt-errors:FOAR0002
118
119=== added file 'test/rbkt/Queries/zorba/numerics/overflow-1.xq'
120--- test/rbkt/Queries/zorba/numerics/overflow-1.xq 1970-01-01 00:00:00 +0000
121+++ test/rbkt/Queries/zorba/numerics/overflow-1.xq 2013-01-15 18:13:26 +0000
122@@ -0,0 +1,1 @@
123+xs:float("1000000000000000000000000000000000000000000000000000000")
124
125=== added file 'test/rbkt/Queries/zorba/numerics/overflow-2.spec'
126--- test/rbkt/Queries/zorba/numerics/overflow-2.spec 1970-01-01 00:00:00 +0000
127+++ test/rbkt/Queries/zorba/numerics/overflow-2.spec 2013-01-15 18:13:26 +0000
128@@ -0,0 +1,2 @@
129+Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/numerics/overflow-2.xml.res
130+Error: http://www.w3.org/2005/xqt-errors:FOAR0002
131
132=== added file 'test/rbkt/Queries/zorba/numerics/overflow-2.xq'
133--- test/rbkt/Queries/zorba/numerics/overflow-2.xq 1970-01-01 00:00:00 +0000
134+++ test/rbkt/Queries/zorba/numerics/overflow-2.xq 2013-01-15 18:13:26 +0000
135@@ -0,0 +1,1 @@
136+xs:float("-100000000000000000000000000000000000000000000000000000")
137
138=== added file 'test/rbkt/Queries/zorba/numerics/overflow-3.spec'
139--- test/rbkt/Queries/zorba/numerics/overflow-3.spec 1970-01-01 00:00:00 +0000
140+++ test/rbkt/Queries/zorba/numerics/overflow-3.spec 2013-01-15 18:13:26 +0000
141@@ -0,0 +1,2 @@
142+Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/numerics/overflow-3.xml.res
143+Error: http://www.w3.org/2005/xqt-errors:FOAR0002
144
145=== added file 'test/rbkt/Queries/zorba/numerics/overflow-3.xq'
146--- test/rbkt/Queries/zorba/numerics/overflow-3.xq 1970-01-01 00:00:00 +0000
147+++ test/rbkt/Queries/zorba/numerics/overflow-3.xq 2013-01-15 18:13:26 +0000
148@@ -0,0 +1,1 @@
149+xs:double("1E1000")
150
151=== added file 'test/rbkt/Queries/zorba/numerics/overflow-4.spec'
152--- test/rbkt/Queries/zorba/numerics/overflow-4.spec 1970-01-01 00:00:00 +0000
153+++ test/rbkt/Queries/zorba/numerics/overflow-4.spec 2013-01-15 18:13:26 +0000
154@@ -0,0 +1,2 @@
155+Result: $RBKT_SRC_DIR/ExpQueryResults/zorba/numerics/overflow-4.xml.res
156+Error: http://www.w3.org/2005/xqt-errors:FOAR0002
157
158=== added file 'test/rbkt/Queries/zorba/numerics/overflow-4.xq'
159--- test/rbkt/Queries/zorba/numerics/overflow-4.xq 1970-01-01 00:00:00 +0000
160+++ test/rbkt/Queries/zorba/numerics/overflow-4.xq 2013-01-15 18:13:26 +0000
161@@ -0,0 +1,1 @@
162+xs:double("-1E1000")

Subscribers

People subscribed via source and target branches