Merge lp:~albaguirre/mir/workaround-for-1482274 into lp:mir

[Alberto Aguirre]

Workaround for GLibMainLoopTest.propagates_exception_from_server_action failure

The test fails with GCC5 when using -O2 options in armhf which seems to be caused by using identical lambda definitions.
As a workaround the exception message is changed to force the compiler to generate a unique implementation instead of sharing one;this allows the exception to be caught as expected.

Workaround for GLibMainLoopTest.propagates_exception_from_server_action failure

The test fails with GCC5 when using -O2 options in armhf which seems to be caused by using identical lambda definitions.
As a workaround the exception message is changed to force the compiler to generate a unique implementation instead of sharing one;this allows the exception to be caught as expected.

[Alan Griffiths (alan-griffiths)]

WTF?!

review: Approve

[Kevin DuBois (kdub)]

a zany bug, lgtm.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2819
http://jenkins.qa.ubuntu.com/job/mir-ci/4499/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3440
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/648
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3388
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6175
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22379

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

review: Approve (continuous-integration)

=== modified file 'tests/unit-tests/test_glib_main_loop.cpp'
--- tests/unit-tests/test_glib_main_loop.cpp	2015-08-04 17:47:18 +0000
+++ tests/unit-tests/test_glib_main_loop.cpp	2015-08-06 16:22:05 +0000
@@ -771,7 +771,7 @@
     execute_in_forked_process(this,
         [&]
         {
-            ml.enqueue(this, [] { throw std::runtime_error("server action error"); });
+            ml.enqueue(this, [] { throw std::runtime_error("server action exception"); });
 
             EXPECT_THROW({
                 ml.run();