← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_March_20 into lp:zorba

 

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

Commit message:
- updated FOTS snapshot to March 20th
- updated EXPECTED_FOTS_FAILURES list

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

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

- updated FOTS snapshot to March 20th
- updated EXPECTED_FOTS_FAILURES list
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_March_20/+merge/154269
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-03-17 15:20:38 +0000
+++ test/fots/CMakeLists.txt	2013-03-20 07:03:22 +0000
@@ -479,6 +479,14 @@
 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)
 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)
 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)
+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-004 1157567)
+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-005 1157567)
+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-009 1157567)
+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-010 1157567)
+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-004 1157567)
+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-005 1157567)
+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-009 1157567)
+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-010 1157567)
 EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
@@ -613,8 +621,6 @@
 EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
-EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0)
-EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)
 EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)
@@ -643,13 +649,6 @@
 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-3-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-4-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-6-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-7-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-8-ns 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-9-ns 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-2-s 0)
@@ -668,11 +667,9 @@
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-4 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-5 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-extensions-1 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-1-ns3 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-3-ns3 0)
 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-5-ns 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)

=== modified file 'test/fots/ImportFOTS.cmake'
--- test/fots/ImportFOTS.cmake	2013-03-17 15:20:38 +0000
+++ test/fots/ImportFOTS.cmake	2013-03-20 07:03:22 +0000
@@ -19,7 +19,7 @@
 
 
 # Change this to publish updated FOTS archives
-SET (FOTS_ARCHIVE "FOTS_170313.tgz")
+SET (FOTS_ARCHIVE "FOTS_200313.tgz")
 
 # Change this to modify which elements in FOTS driver results are output
 # as CDATA
@@ -27,16 +27,21 @@
 
 # Download and unpack pre-created archive
 SET (_outdir "${BUILDDIR}/test/fots")
-MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")
-FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}
-  "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)
-LIST (GET _dlstat 0 _dlcode)
-IF (NOT _dlcode EQUAL 0)
-  LIST (GET _dlstat 1 _dlmsg)
-  MESSAGE (FATAL_ERROR "Error downloading FOTS archive: ${_dlmsg}")
-ENDIF (NOT _dlcode EQUAL 0)
+IF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
+  MESSAGE (STATUS "FOTS archive '${FOTS_ARCHIVE}' already downloaded.")
+ELSEIF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
+  MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")
+  FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}
+    "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)
+  LIST (GET _dlstat 0 _dlcode)
+  IF (NOT _dlcode EQUAL 0)
+    LIST (GET _dlstat 1 _dlmsg)
+    MESSAGE (FATAL_ERROR "Error downloading FOTS archive: ${_dlmsg}")
+  ENDIF (NOT _dlcode EQUAL 0)
+ENDIF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
 
 # Remove old version of the FOTS testsuite (if it exists)
+MESSAGE (STATUS "Remove old version of the FOTS testsuite (if it exists)...")
 EXECUTE_PROCESS (COMMAND "${CMAKE_COMMAND}" -E remove_directory "${_outdir}/2011"
   RESULT_VARIABLE _remove)
 


Follow ups