Merge lp:~gerboland/unity8/sigstop-emit-for-AP into lp:unity8

Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1506
Merged at revision: 1513
Proposed branch: lp:~gerboland/unity8/sigstop-emit-for-AP
Merge into: lp:unity8
Diff against target: 24 lines (+7/-0)
1 file modified
tests/mocks/Unity/Application/ApplicationManager.cpp (+7/-0)
To merge this branch: bzr merge lp:~gerboland/unity8/sigstop-emit-for-AP
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+244781@code.launchpad.net

Commit message

MockAppMan: emit SIGSTOP so AP test apps are run

Description of the change

MockAppMan: emit SIGSTOP so AP test apps are run

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
N, is AP fix
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Yup.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
2--- tests/mocks/Unity/Application/ApplicationManager.cpp 2014-09-29 09:54:30 +0000
3+++ tests/mocks/Unity/Application/ApplicationManager.cpp 2014-12-15 19:27:21 +0000
4@@ -20,6 +20,7 @@
5 #include "ApplicationTestInterface.h"
6
7 #include <paths.h>
8+#include <csignal>
9
10 #include <QDir>
11 #include <QGuiApplication>
12@@ -36,6 +37,12 @@
13 {
14 if (!the_application_manager) {
15 the_application_manager = new ApplicationManager();
16+
17+ // Emit signal to notify Upstart that Mir is ready to receive client connections
18+ // see http://upstart.ubuntu.com/cookbook/#expect-stop
19+ if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
20+ raise(SIGSTOP);
21+ }
22 }
23 return the_application_manager;
24 }

Subscribers

People subscribed via source and target branches