Merge lp://staging/~michihenning/thumbnailer/s390x-fix into lp://staging/thumbnailer/devel

Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 320
Merged at revision: 319
Proposed branch: lp://staging/~michihenning/thumbnailer/s390x-fix
Merge into: lp://staging/thumbnailer/devel
Diff against target: 25 lines (+7/-1)
1 file modified
tests/vs-thumb/vs-thumb_test.cpp (+7/-1)
To merge this branch: bzr merge lp://staging/~michihenning/thumbnailer/s390x-fix
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+280653@code.staging.launchpad.net

Commit message

Fixes two minor bugs in the vs-thumb test.

Description of the change

Fixes two minor bugs in the vs-thumb test.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
318. By Michi Henning

Skipping qml test on s390x.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
319. By Michi Henning

Oops, wrong operator.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Are you sure you want to do this? From the look of it, thumbnailer has never successfully built on s390x (the current version is in dep-wait on missing codec packages).

From Steve's email, we'll be able to publish new packages just fine with broken s390x builds, since they never worked in the first place:

https://lists.launchpad.net/ubuntu-phone/msg17189.html

If you fix the s390x builds, then we're on the hook to keep them working. Further more, by disabling tests like this, it will be harder for other people to tell whether they've got our dependencies working correctly in the future.

320. By Michi Henning

Backed out s390x-specific changes.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Top-approving since the fix is trivial.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: