Zorba

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

  1. bump_FOTS_snapshot_Apr_23
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Ghislain Fourny
Approved revision: 11384
Merged at revision: 11398
Proposed branch: lp:~zorba-coders/zorba/bump_FOTS_snapshot_Apr_23
Merge into: lp:zorba
Diff against target: 26 lines (+3/-2)
2 files modified
test/fots/CMakeLists.txt (+2/-1)
test/fots/ImportFOTS.cmake (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_Apr_23
Reviewer Review Type Date Requested Status
Ghislain Fourny Approve
Sorin Marian Nasoi Approve
Review via email: mp+160232@code.launchpad.net

Commit message

Bumped FOTS snapshot to April 23rd.

Description of the change

bumped FOTS snapshot to April 23rd.

To post a comment you must log in.
lp:~zorba-coders/zorba/bump_FOTS_snapshot_Apr_23 updated
11383. By sorin.marian.nasoi <email address hidden>

Merge lp:zorba trunk.

11384. By sorin.marian.nasoi <email address hidden>

- bumped FOTS snapshot to April 23rd.

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_Apr_23-2013-04-22T23-52-49.977Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bump_FOTS_snapshot_Apr_23-2013-04-22T23-52-49.977Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Ghislain Fourny (gislenius) :
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_Apr_23-2013-04-23T08-52-50.854Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bump_FOTS_snapshot_Apr_23-2013-04-23T08-52-50.854Z 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-04-19 04:09:45 +0000
3+++ test/fots/CMakeLists.txt 2013-04-22 23:43:26 +0000
4@@ -393,7 +393,8 @@
5 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature well-formed-feature-4 0)
6 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-1 0)
7 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-2 0)
8-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-3 0)
9+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-feature-list-2-s 0)
10+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-feature-list-3-s 0)
11 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-4 0)
12 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-5 0)
13 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-extensions-1 0)
14
15=== modified file 'test/fots/ImportFOTS.cmake'
16--- test/fots/ImportFOTS.cmake 2013-04-18 19:50:01 +0000
17+++ test/fots/ImportFOTS.cmake 2013-04-22 23:43:26 +0000
18@@ -19,7 +19,7 @@
19
20
21 # Change this to publish updated FOTS archives
22-SET (FOTS_ARCHIVE "FOTS_180413.tgz")
23+SET (FOTS_ARCHIVE "FOTS_230413.tgz")
24
25 # Change this to modify which elements in FOTS driver results are output
26 # as CDATA

Subscribers

People subscribed via source and target branches