Merge lp:~tiagosh/telephony-service/launch-indicator into lp:telephony-service

[Tiago Salem Herrmann]

Add upstart job to launch telephony-service indicator at startup.

Add upstart job to launch telephony-service indicator at startup.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:789
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/137/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/61/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/137/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telephony-service/launch-indicator]

790. By Tiago Salem Herrmann on 2014-03-24

fix tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:790
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/138/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/launch-indicator]

791. By Tiago Salem Herrmann on 2014-03-26

revert fix for tests

792. By Tiago Salem Herrmann on 2014-03-27

merge test fixes

Unmerged revisions

=== modified file 'Ubuntu/Telephony/tests/CMakeLists.txt'
--- Ubuntu/Telephony/tests/CMakeLists.txt	2013-08-14 16:18:33 +0000
+++ Ubuntu/Telephony/tests/CMakeLists.txt	2014-03-24 19:50:11 +0000
@@ -10,7 +10,7 @@
         target_link_libraries(${test}
             telephonyservice-qml
             )
-        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
+        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -platform offscreen -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
     endforeach(test)
 endmacro(generate_tests)
 

=== modified file 'debian/telephony-service.install'
--- debian/telephony-service.install	2013-12-21 23:44:41 +0000
+++ debian/telephony-service.install	2014-03-24 19:50:11 +0000
@@ -15,3 +15,4 @@
 usr/share/telepathy/clients/TelephonyService*.client
 usr/share/telephony-service/assets/*
 var/lib/polkit-1/localauthority/10-vendor.d/*TelephonyService*.pkla
+upstart/telephony-service-indicator.conf /usr/share/upstart/sessions

=== modified file 'libtelephonyservice/tests/CMakeLists.txt'
--- libtelephonyservice/tests/CMakeLists.txt	2014-02-27 22:35:40 +0000
+++ libtelephonyservice/tests/CMakeLists.txt	2014-03-24 19:50:11 +0000
@@ -35,7 +35,7 @@
         target_link_libraries(${test}
             telephonyservice
             )
-        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
+        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -platform offscreen -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
     endforeach(test)
 endmacro(generate_tests)
 

=== added directory 'upstart'
=== added file 'upstart/telephony-service-indicator.conf'
--- upstart/telephony-service-indicator.conf	1970-01-01 00:00:00 +0000
+++ upstart/telephony-service-indicator.conf	2014-03-24 19:50:11 +0000
@@ -0,0 +1,9 @@
+description "telephony-service-indicator"
+author "Tiago Salem Herrmann <[e-mail]>"
+
+start on started unity8
+stop on session-end
+
+respawn
+
+exec /usr/bin/telephony-service-indicator