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

[Kevin DuBois]

fix integration test failure on the galaxy nexus that was due to creating two surfaces and registering the same buffer twice

fixes: lp: #1272597

fix integration test failure on the galaxy nexus that was due to creating two surfaces and registering the same buffer twice.

the current code makes two surfaces, only one of which was used. eliminate the 2nd surface creation.

fixes: lp: #1272597

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1356
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/729/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/459
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/463
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/340
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/351
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3351

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

review: Approve

[Alan Griffiths (alan-griffiths)]

I don't follow why would creating two surfaces cause a problem? AFAICS the egl test code only references one of them and we should support having multiple surfaces on a connection.

NM I get it - the stub server only supports a single buffer. (Burbling left in case anyone else is confused.)

review: Approve

[Kevin DuBois (kdub)]

> I don't follow why would creating two surfaces cause a problem? AFAICS the egl
> test code only references one of them and we should support having multiple
> surfaces on a connection.
>
> NM I get it - the stub server only supports a single buffer. (Burbling left in
> case anyone else is confused.)

Yeah, the 'server' test stub doesn't handle multi-surfaces.

=== modified file 'tests/integration-tests/client/test_client_render.cpp'
--- tests/integration-tests/client/test_client_render.cpp	2014-01-13 06:12:33 +0000
+++ tests/integration-tests/client/test_client_render.cpp	2014-01-25 01:35:47 +0000
@@ -120,13 +120,7 @@
     {
         process_sync.wait_for_signal_ready_for();
 
-        MirSurfaceParameters surface_parameters
-        {
-            "testsurface", test_width, test_height, mir_pixel_format_abgr_8888,
-            mir_buffer_usage_hardware, mir_display_output_id_invalid
-        };
         auto connection = mir_connect_sync(socket_file, "test_renderer");
-        auto surface = mir_connection_create_surface_sync(connection, &surface_parameters);
 
         /* set up egl context */
         int major, minor, n;
@@ -173,7 +167,7 @@
             eglSwapBuffers(egl_display, egl_surface);
         }
 
-        mir_surface_release_sync(surface);
+        mir_surface_release_sync(mir_surface);
         mir_connection_release(connection);
         return 0;
     }