Merge lp:~alan-griffiths/mir/fix-1237710 into lp:mir

[Alan Griffiths]

Fix failing acceptance-test:
ServerShutdown/OnSignal.removes_endpoint_on_signal (LP: #1237710)

Avoid fatal_signal_cleanup getting caught in a loop restoring itself and
then re-entering itself. This could happen in some permutations of
acceptance-tests where run_mir is entered with fatal_signal_cleanup already
set up from previous tests' server instances.

run_mir: restore signals handlers after the server exits.

[Alan Griffiths (alan-griffiths)]

Of course, this doesn't restore the handlers if an exception propagates out of server.run(). There's a longer version that handles this:

https://code.launchpad.net/~alan-griffiths/mir/raii-fix-1237710/+merge/191420

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1139
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/182/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2275
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/179/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/182/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

review: Approve

[Alexandros Frantzis (afrantzis)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1139
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/181
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/181/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/184/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

review: Abstain

[Daniel van Vugt (vanvugt)]

It works too.

review: Approve

=== modified file 'src/server/run_mir.cpp'
--- src/server/run_mir.cpp	2013-10-14 06:33:42 +0000
+++ src/server/run_mir.cpp	2013-10-16 13:38:10 +0000
@@ -78,4 +78,7 @@
 
     init(server);
     server.run();
+
+    for (auto sig : { SIGQUIT, SIGABRT, SIGFPE, SIGSEGV, SIGBUS })
+        signal(sig, old_handler[sig]);
 }