Merge lp:~afrantzis/mir/fix-1407863-armhf-ci into lp:mir/0.11

[Alexandros Frantzis]

tests: Increase timeout to account for slow valgrind performance with forks

tests: Increase timeout to account for slow valgrind performance with forks

Local experiments indicate that the previous timeout of 5 seconds was on the edge (runtime of forking tests under valgrind armhf was about 5.5 seconds), so a timeout of 10 seconds seems reasonable. If we still have problems we can increase at will.

[Robert Carr (robertcarr)]

LGTM. I would go ahead and bump to something pretty large like 60 or so since it wont make passes run slower.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2283
http://jenkins.qa.ubuntu.com/job/mir-ci/2873/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/870
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1113
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4166
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17672

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

ok

review: Approve

[Kevin DuBois (kdub)]

> LGTM. I would go ahead and bump to something pretty large like 60 or so since
> it wont make passes run slower.

Fast-fail and fast-succeed is the best, and given our CI setup, I don't mind slow-failing tests as much as slow-succeeding tests... I'm okay with 10s or longer

[Daniel van Vugt (vanvugt)]

Targeting the wrong branch now. Somehow!?

review: Needs Resubmitting

=== modified file 'tests/unit-tests/test_glib_main_loop.cpp'
--- tests/unit-tests/test_glib_main_loop.cpp	2015-01-14 06:39:13 +0000
+++ tests/unit-tests/test_glib_main_loop.cpp	2015-02-02 15:50:59 +0000
@@ -57,7 +57,9 @@
     else
     {
         mir_test_framework::Process child{pid};
-        auto const result = child.wait_for_termination(std::chrono::seconds{5});
+        // Note: valgrind on armhf can very slow when dealing with forks,
+        // so give it enough time.
+        auto const result = child.wait_for_termination(std::chrono::seconds{10});
         EXPECT_TRUE(result.succeeded());
     }
 }