zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bump_FOTS_snapshot_March_21 into lp:zorba.

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


Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_March_21/+merge/154793

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

-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_March_21/+merge/154793
Your team Zorba Coders is subscribed to branch lp:zorba.

=== 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 @@
 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
-EXPECTED_FOTS_FAILURE (prod-CastExpr K2-SeqExprCast-231 21263)
-EXPECTED_FOTS_FAILURE (prod-CastExpr K2-SeqExprCast-232 21263)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-002 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-dateTime-001 0)
@@ -667,7 +665,6 @@
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)

=== 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 @@
 
 
 # Change this to publish updated FOTS archives
-SET (FOTS_ARCHIVE "FOTS_200313.tgz")
+SET (FOTS_ARCHIVE "FOTS_210313.tgz")
 
 # Change this to modify which elements in FOTS driver results are output
 # as CDATA

=== 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 @@
       "$x eq ",
       if (starts-with(data($expResult), $type))
       then data($expResult)
-      else concat($type,"(", data($expResult), ")"));
+      else concat($type,"(",
+                  if(ends-with($expResult,'INF') or ends-with($expResult,'NaN'))
+                  then concat("'",$expResult,"'")
+                  else $expResult,
+                  ")"));
     variable  $queryKey := xqxq:prepare-main-module($queryText);
    
     xqxq:bind-variable($queryKey,