Merge lp:~aacid/unity8/run_upstart into lp:unity8

[Albert Astals Cid]

Use upstart in ./run

Makes it so that you can use the lock button on the device without getting that nasty hwc crash

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * 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

[lp:~aacid/unity8/run_upstart]

827. By Albert Astals Cid on 2014-04-10

Just bail out if unity8 is running

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:827
http://jenkins.qa.ubuntu.com/job/unity8-ci/2799/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/190
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4760
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1324
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4343/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5916
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4889
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4889/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

10 + /sbin/stop unity8

25 + /sbin/start unity8

Use initctl, not those wrappers directly.

review: Needs Fixing

[lp:~aacid/unity8/run_upstart]

828. By Albert Astals Cid on 2014-04-14

Use initctl

[Albert Astals Cid (aacid)]

> 10 + /sbin/stop unity8
>
> 25 + /sbin/start unity8
>
> Use initctl, not those wrappers directly.

Done

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
No, otto failures.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:828
http://jenkins.qa.ubuntu.com/job/unity8-ci/2807/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/222
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1332
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1332/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4389
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4389/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5990
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4944
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4944/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Please strip tags, you can use the script:

http://people.canonical.com/~msawicz/unity8/strip-u8-tags.sh

Pass lp:~aacid/unity8/run_upstart as an argument.

=== modified file 'run'
--- run	2013-12-17 14:56:25 +0000
+++ run	2014-04-14 08:40:17 +0000
@@ -68,8 +68,22 @@
   QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"
 fi
 
+control_c()
+{
+  /sbin/initctl stop unity8
+  exit $?
+}
+
+trap control_c INT
+
 if $GDB; then
   gdb -ex run --args $QML_PHONE_SHELL_PATH $QML_PHONE_SHELL_ARGS $@
 else
-  $QML_PHONE_SHELL_PATH $QML_PHONE_SHELL_ARGS $@
+  status=`/sbin/initctl status unity8`
+  if [ "$status" != "unity8 stop/waiting" ]; then
+    echo "Unity8 is already running, please stop it first"
+    exit 1
+  fi
+  /sbin/initctl start unity8 BINARY="`readlink -f $QML_PHONE_SHELL_PATH` $QML_PHONE_SHELL_ARGS $@"
+  tailf -n 0 ~/.cache/upstart/unity8.log
 fi