Zorba

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

  1. bump_FOTS_snapshot_March_21
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
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 Approve
Sorin Marian Nasoi Approve
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.
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/bump_FOTS_snapshot_March_21-2013-03-21T19-35-49.103Z/log.html

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
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
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-03-21 18:22:40 +0000
+++ test/fots/CMakeLists.txt 2013-03-21 19:20:37 +0000
@@ -502,8 +502,6 @@
502EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)502EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
503EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)503EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
504EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)504EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
505EXPECTED_FOTS_FAILURE (prod-CastExpr K2-SeqExprCast-231 21263)
506EXPECTED_FOTS_FAILURE (prod-CastExpr K2-SeqExprCast-232 21263)
507EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)505EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)
508EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-002 0)506EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-002 0)
509EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-dateTime-001 0)507EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-dateTime-001 0)
@@ -667,7 +665,6 @@
667EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)665EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)
668EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)666EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)
669EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)667EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
670EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
671EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)668EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
672EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)669EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)
673EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)670EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)
674671
=== modified file 'test/fots/ImportFOTS.cmake'
--- test/fots/ImportFOTS.cmake 2013-03-20 22:13:15 +0000
+++ test/fots/ImportFOTS.cmake 2013-03-21 19:20:37 +0000
@@ -19,7 +19,7 @@
1919
2020
21# Change this to publish updated FOTS archives21# Change this to publish updated FOTS archives
22SET (FOTS_ARCHIVE "FOTS_200313.tgz")22SET (FOTS_ARCHIVE "FOTS_210313.tgz")
2323
24# Change this to modify which elements in FOTS driver results are output24# Change this to modify which elements in FOTS driver results are output
25# as CDATA25# as CDATA
2626
=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq 2013-03-15 18:25:44 +0000
+++ test/fots_driver/evaluate.xq 2013-03-21 19:20:37 +0000
@@ -396,7 +396,11 @@
396 "$x eq ",396 "$x eq ",
397 if (starts-with(data($expResult), $type))397 if (starts-with(data($expResult), $type))
398 then data($expResult)398 then data($expResult)
399 else concat($type,"(", data($expResult), ")"));399 else concat($type,"(",
400 if(ends-with($expResult,'INF') or ends-with($expResult,'NaN'))
401 then concat("'",$expResult,"'")
402 else $expResult,
403 ")"));
400 variable $queryKey := xqxq:prepare-main-module($queryText);404 variable $queryKey := xqxq:prepare-main-module($queryText);
401 405
402 xqxq:bind-variable($queryKey,406 xqxq:bind-variable($queryKey,

Subscribers

People subscribed via source and target branches