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
1=== modified file 'test/fots/CMakeLists.txt'
2--- test/fots/CMakeLists.txt 2013-03-17 15:20:38 +0000
3+++ test/fots/CMakeLists.txt 2013-03-20 07:03:22 +0000
4@@ -479,6 +479,14 @@
5 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)
6 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)
7 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)
8+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-004 1157567)
9+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-005 1157567)
10+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-009 1157567)
11+EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-010 1157567)
12+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-004 1157567)
13+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-005 1157567)
14+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-009 1157567)
15+EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-010 1157567)
16 EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
17 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
18 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
19@@ -613,8 +621,6 @@
20 EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
21 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
22 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
23-EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0)
24-EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0)
25 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)
26 EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0)
27 EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)
28@@ -643,13 +649,6 @@
29 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
30 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
31 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
32-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0)
33-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0)
34-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-3-ns 0)
35-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-4-ns 0)
36-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-6-ns 0)
37-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-7-ns 0)
38-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-8-ns 0)
39 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-9-ns 0)
40 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 0)
41 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-2-s 0)
42@@ -668,11 +667,9 @@
43 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-4 0)
44 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-5 0)
45 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-extensions-1 0)
46-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-1-ns3 0)
47 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-3-ns3 0)
48 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)
49 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)
50-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-ns 0)
51 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
52 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
53 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
54
55=== modified file 'test/fots/ImportFOTS.cmake'
56--- test/fots/ImportFOTS.cmake 2013-03-17 15:20:38 +0000
57+++ test/fots/ImportFOTS.cmake 2013-03-20 07:03:22 +0000
58@@ -19,7 +19,7 @@
59
60
61 # Change this to publish updated FOTS archives
62-SET (FOTS_ARCHIVE "FOTS_170313.tgz")
63+SET (FOTS_ARCHIVE "FOTS_200313.tgz")
64
65 # Change this to modify which elements in FOTS driver results are output
66 # as CDATA
67@@ -27,16 +27,21 @@
68
69 # Download and unpack pre-created archive
70 SET (_outdir "${BUILDDIR}/test/fots")
71-MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")
72-FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}
73- "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)
74-LIST (GET _dlstat 0 _dlcode)
75-IF (NOT _dlcode EQUAL 0)
76- LIST (GET _dlstat 1 _dlmsg)
77- MESSAGE (FATAL_ERROR "Error downloading FOTS archive: ${_dlmsg}")
78-ENDIF (NOT _dlcode EQUAL 0)
79+IF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
80+ MESSAGE (STATUS "FOTS archive '${FOTS_ARCHIVE}' already downloaded.")
81+ELSEIF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
82+ MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")
83+ FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}
84+ "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)
85+ LIST (GET _dlstat 0 _dlcode)
86+ IF (NOT _dlcode EQUAL 0)
87+ LIST (GET _dlstat 1 _dlmsg)
88+ MESSAGE (FATAL_ERROR "Error downloading FOTS archive: ${_dlmsg}")
89+ ENDIF (NOT _dlcode EQUAL 0)
90+ENDIF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
91
92 # Remove old version of the FOTS testsuite (if it exists)
93+MESSAGE (STATUS "Remove old version of the FOTS testsuite (if it exists)...")
94 EXECUTE_PROCESS (COMMAND "${CMAKE_COMMAND}" -E remove_directory "${_outdir}/2011"
95 RESULT_VARIABLE _remove)
96

Subscribers

People subscribed via source and target branches