Zorba

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

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

Commit message

bump QT snapshot

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

-megred lp:zorba trunk.

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

- bump QT snapshot to Jul 24th.

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

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_jul_24/+merge/176658

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_jul_24/+merge/176658 :
Votes: {'Pending': 1}

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_jul_24/+merge/176658

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/51/console to view the results.

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_jul_24/+merge/176658

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

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-07-12 08:45:22 +0000
3+++ test/fots/CMakeLists.txt 2013-07-24 11:18:35 +0000
4@@ -186,6 +186,7 @@
5 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-054 1123835)
6 EXPECTED_FOTS_FAILURE (math-acos math-acos-003 1188109)
7 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 1188116)
8+EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 1204471)
9 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof11 1188329)
10 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof12 1188299)
11 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-1 1188122)
12
13=== modified file 'test/fots/ImportFOTS.cmake'
14--- test/fots/ImportFOTS.cmake 2013-07-10 18:19:32 +0000
15+++ test/fots/ImportFOTS.cmake 2013-07-24 11:18:35 +0000
16@@ -23,8 +23,8 @@
17 #this is the official QT 1.0 release from 21st June 2013
18 #SET (FOTS_ARCHIVE "QT3_1_0.tgz")
19
20-#this is the QT CVS trunk version as from 10th July 2013
21-SET (FOTS_ARCHIVE "QT_100713.tgz")
22+#this is the QT CVS trunk version as from 24th July 2013
23+SET (FOTS_ARCHIVE "QT_240713.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