Zorba

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

  1. bump_FOTS_snapshot_March_20
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 11294
Merged at revision: 11295
Proposed branch: lp:~zorba-coders/zorba/bump_FOTS_snapshot_March_20
Merge into: lp:zorba
Diff against target: 95 lines (+22/-20)
2 files modified
test/fots/CMakeLists.txt (+8/-11)
test/fots/ImportFOTS.cmake (+14/-9)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_March_20
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Sorin Marian Nasoi Approve
Review via email: mp+154269@code.launchpad.net

Commit message

- updated FOTS snapshot to March 20th
- updated EXPECTED_FOTS_FAILURES list

Description of the change

- updated FOTS snapshot to March 20th
- updated EXPECTED_FOTS_FAILURES list

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_20-2013-03-20T07-04-46.582Z/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_20-2013-03-20T07-04-46.582Z 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-17 15:20:38 +0000
+++ test/fots/CMakeLists.txt 2013-03-20 07:03:22 +0000
@@ -479,6 +479,14 @@
479EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)479EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)
480EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)480EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)
481EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)481EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)
482EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-004 1157567)
483EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-005 1157567)
484EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-009 1157567)
485EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-010 1157567)
486EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-004 1157567)
487EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-005 1157567)
488EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-009 1157567)
489EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-010 1157567)
482EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)490EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
483EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)491EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
484EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)492EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
@@ -613,8 +621,6 @@
613EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)621EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
614EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)622EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
615EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)623EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
616EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0)
617EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0)
618EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)624EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)
619EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0)625EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0)
620EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)626EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)
@@ -643,13 +649,6 @@
643EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)649EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
644EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)650EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
645EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)651EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
646EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0)
647EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0)
648EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-3-ns 0)
649EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-4-ns 0)
650EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-6-ns 0)
651EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-7-ns 0)
652EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-8-ns 0)
653EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-9-ns 0)652EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-9-ns 0)
654EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 0)653EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 0)
655EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-2-s 0)654EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-2-s 0)
@@ -668,11 +667,9 @@
668EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-4 0)667EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-4 0)
669EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-5 0)668EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-5 0)
670EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-extensions-1 0)669EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-extensions-1 0)
671EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-1-ns3 0)
672EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-3-ns3 0)670EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-3-ns3 0)
673EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)671EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)
674EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)672EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)
675EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-ns 0)
676EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)673EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
677EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)674EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
678EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)675EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
679676
=== 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 @@
1919
2020
21# Change this to publish updated FOTS archives21# Change this to publish updated FOTS archives
22SET (FOTS_ARCHIVE "FOTS_170313.tgz")22SET (FOTS_ARCHIVE "FOTS_200313.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
@@ -27,16 +27,21 @@
2727
28# Download and unpack pre-created archive28# Download and unpack pre-created archive
29SET (_outdir "${BUILDDIR}/test/fots")29SET (_outdir "${BUILDDIR}/test/fots")
30MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")30IF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
31FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}31 MESSAGE (STATUS "FOTS archive '${FOTS_ARCHIVE}' already downloaded.")
32 "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)32ELSEIF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
33LIST (GET _dlstat 0 _dlcode)33 MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")
34IF (NOT _dlcode EQUAL 0)34 FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}
35 LIST (GET _dlstat 1 _dlmsg)35 "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)
36 MESSAGE (FATAL_ERROR "Error downloading FOTS archive: ${_dlmsg}")36 LIST (GET _dlstat 0 _dlcode)
37ENDIF (NOT _dlcode EQUAL 0)37 IF (NOT _dlcode EQUAL 0)
38 LIST (GET _dlstat 1 _dlmsg)
39 MESSAGE (FATAL_ERROR "Error downloading FOTS archive: ${_dlmsg}")
40 ENDIF (NOT _dlcode EQUAL 0)
41ENDIF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
3842
39# Remove old version of the FOTS testsuite (if it exists)43# Remove old version of the FOTS testsuite (if it exists)
44MESSAGE (STATUS "Remove old version of the FOTS testsuite (if it exists)...")
40EXECUTE_PROCESS (COMMAND "${CMAKE_COMMAND}" -E remove_directory "${_outdir}/2011"45EXECUTE_PROCESS (COMMAND "${CMAKE_COMMAND}" -E remove_directory "${_outdir}/2011"
41 RESULT_VARIABLE _remove)46 RESULT_VARIABLE _remove)
4247

Subscribers

People subscribed via source and target branches