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

[Alan Griffiths]

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

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

[PS Jenkins bot (ps-jenkins)]

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)

[Kevin DuBois (kdub)]

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

[Alan Griffiths (alan-griffiths)]

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

Yes (both)

[Kevin DuBois (kdub)]

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.

=== modified file 'tests/integration-tests/graphics/android/test_display_integration.cpp'
--- tests/integration-tests/graphics/android/test_display_integration.cpp	2014-01-09 16:47:21 +0000
+++ tests/integration-tests/graphics/android/test_display_integration.cpp	2013-12-18 02:19:19 +0000
@@ -68,8 +68,7 @@
 std::shared_ptr<mga::ResourceFactory> AndroidGPUDisplay::display_resource_factory;
 }
 
-// disabled to unblock CI - see lp:1239955
-TEST_F(AndroidGPUDisplay, DISABLED_gpu_display_ok_with_gles)
+TEST_F(AndroidGPUDisplay, gpu_display_ok_with_gles)
 {
     auto should_use_fb_fallback = true;
     auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();