Merge lp:~afrantzis/mir/workaround-1478213-gcc-5-armhf-test-failures into lp:mir

[Alexandros Frantzis]

tests: Work around strange failures seen with gcc-5 on armhf

tests: Work around strange failures seen with gcc-5 on armhf

I haven't found the root cause of this problem yet, but using non-empty messages in std::runtime_error or another exception type (e.g. std::exception), avoids the test failure.

See the bug comments for more strange findings.

Same fix for 0.14: https://code.launchpad.net/~afrantzis/mir/workaround-1478213-gcc-5-armhf-test-failures-for-0.14/+merge/265972

[Alan Griffiths (alan-griffiths)]

Experience says that if we don't understand why this is happening then the problem will manifest in the worst possible circumstance.

Personally, from the notes so far I'd want to eliminate the possibility that the COW=>SSO changes to the string implementation have confused the runtime library.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2784
http://jenkins.qa.ubuntu.com/job/mir-ci/4423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3320
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/572
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3268
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6064
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22147

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Same comment as in the sister branch.

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'tests/unit-tests/test_glib_main_loop.cpp'
--- tests/unit-tests/test_glib_main_loop.cpp	2015-07-16 08:13:28 +0000
+++ tests/unit-tests/test_glib_main_loop.cpp	2015-07-27 14:10:24 +0000
@@ -268,7 +268,7 @@
             int const signum{SIGUSR1};
             ml.register_signal_handler(
                 {signum},
-                [&] (int) { throw std::runtime_error(""); });
+                [&] (int) { throw std::runtime_error("signal handler error"); });
 
             kill(getpid(), signum);
 
@@ -512,7 +512,7 @@
             ml.register_fd_handler(
                 {p.read_fd()},
                 this,
-                [] (int) { throw std::runtime_error(""); });
+                [] (int) { throw std::runtime_error("fd handler error"); });
 
             EXPECT_EQ(1, write(p.write_fd(), &data_to_write, 1));
 
@@ -753,7 +753,7 @@
     execute_in_forked_process(this,
         [&]
         {
-            ml.enqueue(this, [] { throw std::runtime_error(""); });
+            ml.enqueue(this, [] { throw std::runtime_error("server action error"); });
 
             EXPECT_THROW({ ml.run(); }, std::runtime_error);
         },
@@ -771,7 +771,7 @@
     execute_in_forked_process(this,
         [&]
         {
-            ml.enqueue(this, [] { throw std::runtime_error(""); });
+            ml.enqueue(this, [] { throw std::runtime_error("server action error"); });
 
             EXPECT_THROW({
                 ml.run();
@@ -1061,7 +1061,7 @@
     execute_in_forked_process(this,
         [&]
         {
-            auto alarm = ml.create_alarm([] { throw std::runtime_error(""); });
+            auto alarm = ml.create_alarm([] { throw std::runtime_error("alarm error"); });
             alarm->reschedule_in(std::chrono::milliseconds{0});
 
             EXPECT_THROW({ ml.run(); }, std::runtime_error);