Mir

Merge lp://staging/~alan-griffiths/mir/revert-workaround-1239955 into lp://staging/mir

  1. revert-workaround-1239955
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Superseded
Proposed branch: lp://staging/~alan-griffiths/mir/revert-workaround-1239955
Merge into: lp://staging/mir
Prerequisite: lp://staging/~alan-griffiths/mir/workaround-1239955
Diff against target: 13 lines (+1/-2)
1 file modified
tests/integration-tests/graphics/android/test_display_integration.cpp (+1/-2)
To merge this branch: bzr merge lp://staging/~alan-griffiths/mir/revert-workaround-1239955
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+201042@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2014-02-04.

Commit message

tests: RE-enable test disabled to workaround lp:1239955

Description of the change

tests: RE-enable test disabled to workaround lp:1239955

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1324
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/651/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/614
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/222/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/376
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/379
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/222
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/222/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/244/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2929

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/651/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

This is just to bounce off CI at the moment? (or to remind us to fix?)

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> This is just to bounce off CI at the moment? (or to remind us to fix?)

Yes (both)

Revision history for this message
Kevin DuBois (kdub) wrote :

I'll probably merge these two tests into one test that checks the default rendering mode for the platform. It seems neither the nexus 10 nor the nexus 4 support the fb fallback anymore (and shouldn't be checked) in the android 4.4.

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