Merge lp:~raof/mir/fix-all-the-CI into lp:mir

[Chris Halse Rogers]

Fix two bugs that CI catches that sneaked in while we were manually landing. (LP: #1401364)

Fix the changes that broke CI while we were manually landing things.

[Daniel van Vugt (vanvugt)]

I'm not sure if Alan's test case is correct, but this branch is not passing it:
https://bugs.launchpad.net/mir/+bug/1401364/comments/5

Wait and see what Jenkins says I guess.

review: Needs Information

[Daniel van Vugt (vanvugt)]

Do you have a method for reproducing the original issue locally?

[Chris Halse Rogers (raof)]

This won't fix https://bugs.launchpad.net/mir/+bug/1401364/comments/5, but that doesn't break CI (as death tests never share a process with regular tests).

To reproduce the problem, disable gtest test discovery and enable valgrind.

[Daniel van Vugt (vanvugt)]

Alright, using Chris' newer test case described in bug 1401364, I can reproduce the issue and verify this branch fixes it.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2148
http://jenkins.qa.ubuntu.com/job/mir-ci/2370/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/479
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/453/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/367
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/367/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/453
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/453/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3656/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16543

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2370/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/client/mir_surface_api.cpp'
--- src/client/mir_surface_api.cpp	2014-12-09 03:14:55 +0000
+++ src/client/mir_surface_api.cpp	2014-12-12 01:35:39 +0000
@@ -83,11 +83,13 @@
     params.buffer_usage = requested_specification->buffer_usage;
     params.output_id = requested_specification->output_id;
 
+    bool fullscreen_tmp = requested_specification->fullscreen;
+
     auto shim_callback = new std::function<void(MirSurface*)>;
-    *shim_callback = [requested_specification, shim_callback, callback, context]
+    *shim_callback = [fullscreen_tmp, shim_callback, callback, context]
                      (MirSurface* surface)
     {
-        if (requested_specification->fullscreen)
+        if (fullscreen_tmp)
         {
             mir_surface_set_state(surface, mir_surface_state_fullscreen);
         }

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2014-12-11 02:43:01 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2014-12-12 01:35:39 +0000
@@ -201,6 +201,7 @@
     EXPECT_EQ(request_buffer_usage, response_params.buffer_usage);
 
     mir_wait_for(mir_surface_release( surface, release_surface_callback, this));
+    mir_connection_release(connection);
 }
 
 TEST_F(ClientLibrary, can_set_surface_types)