Merge lp:~kdub/mir/fix-1270685 into lp:mir

[Kevin DuBois]

fix a test bug in AndroidInternalClient.internal_client_creation_and_use which caused the integration tests to hang on the nexus 10 only.

fixes: LP: #1270685

fix a test bug in AndroidInternalClient.internal_client_creation_and_use which caused the integration tests to hang on the nexus 10 only.

fixes: LP: #1270685

The nexus 10 driver would request 3 buffers before rendering the first frame, which was causing the test hang because the compositor was not consuming any buffers in this test. The other drivers would not request as many buffers, so they weren't affected. The fix was setting the internal surface to swapinterval 0 in the test.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/786/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/516
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/516/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/520
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/413
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/413/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/409
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3671

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'tests/integration-tests/graphics/android/test_internal_client.cpp'
--- tests/integration-tests/graphics/android/test_internal_client.cpp	2014-01-13 06:12:33 +0000
+++ tests/integration-tests/graphics/android/test_internal_client.cpp	2014-02-05 22:00:24 +0000
@@ -98,8 +98,9 @@
     auto ss = std::make_shared<ms::SurfaceStack>(surface_allocator, stub_input_registrar, scene_report);
     auto surface_controller = std::make_shared<ms::SurfaceController>(ss);
     auto surface_source = std::make_shared<ms::SurfaceSource>(surface_controller, std::make_shared<mtd::NullSurfaceConfigurator>());
-    auto mir_surface = as_internal_surface(
-        surface_source->create_surface(nullptr, params, id, std::shared_ptr<mf::EventSink>()));
+    auto surface = surface_source->create_surface(nullptr, params, id, std::shared_ptr<mf::EventSink>());
+    surface->allow_framedropping(true);
+    auto mir_surface = as_internal_surface(surface);
 
     auto options = std::shared_ptr<mo::ProgramOption>();
     auto report = std::shared_ptr<mg::NullDisplayReport>();