Mir

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

  1. workaround-1239955
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Andreas Pokorny
Approved revision: no longer in the source branch.
Merged at revision: 1323
Proposed branch: lp:~alan-griffiths/mir/workaround-1239955
Merge into: lp:mir
Diff against target: 13 lines (+2/-1)
1 file modified
tests/integration-tests/graphics/android/test_display_integration.cpp (+2/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/workaround-1239955
Reviewer Review Type Date Requested Status
Andreas Pokorny (community) Approve
Kevin DuBois (community) Approve
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+201005@code.launchpad.net

Commit message

tests: disable test that's blocking CI pending a real resolution

Description of the change

tests: disable test that's blocking CI pending a real resolution

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

PASSED: Continuous integration, rev:1323
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/646/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/372
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/372/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/375
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/216
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/238
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2906

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

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

OK.

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

okay, ill look into the failure today

review: Approve
Revision history for this message
Andreas Pokorny (andreas-pokorny) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/integration-tests/graphics/android/test_display_integration.cpp'
2--- tests/integration-tests/graphics/android/test_display_integration.cpp 2013-12-18 02:19:19 +0000
3+++ tests/integration-tests/graphics/android/test_display_integration.cpp 2014-01-09 13:17:39 +0000
4@@ -68,7 +68,8 @@
5 std::shared_ptr<mga::ResourceFactory> AndroidGPUDisplay::display_resource_factory;
6 }
7
8-TEST_F(AndroidGPUDisplay, gpu_display_ok_with_gles)
9+// disabled to unblock CI - see lp:1239955
10+TEST_F(AndroidGPUDisplay, DISABLED_gpu_display_ok_with_gles)
11 {
12 auto should_use_fb_fallback = true;
13 auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();

Subscribers

People subscribed via source and target branches