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

Proposed by Sorin Marian Nasoi on 2013-03-21
Status: Merged
Approved by: Sorin Marian Nasoi on 2013-03-21
Approved revision: 11298
Merged at revision: 11303
Proposed branch: lp:~zorba-coders/zorba/bump_FOTS_snapshot_March_21
Merge into: lp:zorba
Diff against target: 50 lines (+6/-5)
3 files modified
test/fots/CMakeLists.txt (+0/-3)
test/fots/ImportFOTS.cmake (+1/-1)
test/fots_driver/evaluate.xq (+5/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_March_21
Reviewer Review Type Date Requested Status
Chris Hillery 2013-03-21 Approve on 2013-03-21
Sorin Marian Nasoi Approve on 2013-03-21
Review via email: mp+154793@code.launchpad.net

Commit message

Updated FOTS snapshot to March 21st.
Added special case for 'INF', '-INF' and 'NaN' in 'assert-eq'.

Description of the change

Updated FOTS snapshot to March 21st.
Added special case for 'INF', '-INF' and 'NaN' in 'assert-eq'.

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

Validation queue job bump_FOTS_snapshot_March_21-2013-03-21T19-35-49.103Z 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-03-21 18:22:40 +0000
3+++ test/fots/CMakeLists.txt 2013-03-21 19:20:37 +0000
4@@ -502,8 +502,6 @@
5 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
6 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
7 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
8-EXPECTED_FOTS_FAILURE (prod-CastExpr K2-SeqExprCast-231 21263)
9-EXPECTED_FOTS_FAILURE (prod-CastExpr K2-SeqExprCast-232 21263)
10 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)
11 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-002 0)
12 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-dateTime-001 0)
13@@ -667,7 +665,6 @@
14 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)
15 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)
16 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
17-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
18 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
19 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)
20 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)
21
22=== modified file 'test/fots/ImportFOTS.cmake'
23--- test/fots/ImportFOTS.cmake 2013-03-20 22:13:15 +0000
24+++ test/fots/ImportFOTS.cmake 2013-03-21 19:20:37 +0000
25@@ -19,7 +19,7 @@
26
27
28 # Change this to publish updated FOTS archives
29-SET (FOTS_ARCHIVE "FOTS_200313.tgz")
30+SET (FOTS_ARCHIVE "FOTS_210313.tgz")
31
32 # Change this to modify which elements in FOTS driver results are output
33 # as CDATA
34
35=== modified file 'test/fots_driver/evaluate.xq'
36--- test/fots_driver/evaluate.xq 2013-03-15 18:25:44 +0000
37+++ test/fots_driver/evaluate.xq 2013-03-21 19:20:37 +0000
38@@ -396,7 +396,11 @@
39 "$x eq ",
40 if (starts-with(data($expResult), $type))
41 then data($expResult)
42- else concat($type,"(", data($expResult), ")"));
43+ else concat($type,"(",
44+ if(ends-with($expResult,'INF') or ends-with($expResult,'NaN'))
45+ then concat("'",$expResult,"'")
46+ else $expResult,
47+ ")"));
48 variable $queryKey := xqxq:prepare-main-module($queryText);
49
50 xqxq:bind-variable($queryKey,

Subscribers

People subscribed via source and target branches