libappindicator

Merge lp:~cyphermox/libappindicator/no-kill into lp:libappindicator/13.04

  1. no-kill
  2. Merge into trunk.13.04
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 249
Merged at revision: 249
Proposed branch: lp:~cyphermox/libappindicator/no-kill
Merge into: lp:libappindicator/13.04
Diff against target: 35 lines (+0/-4)
1 file modified
tests/Makefile.am (+0/-4)
To merge this branch: bzr merge lp:~cyphermox/libappindicator/no-kill
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Approve
Review via email: mp+146438@code.launchpad.net

Commit message

We don't need to kill at-spi2-registry, that was only meant for testing.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/30/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/30/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/30//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/30//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/30//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

if jenkins is happy, I am :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/Makefile.am'
2--- tests/Makefile.am 2013-01-23 19:16:37 +0000
3+++ tests/Makefile.am 2013-02-04 15:17:36 +0000
4@@ -138,7 +138,6 @@
5 test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
6 @echo "#!/bin/bash" > $@
7 @echo export DISPLAY= >> $@
8- @echo killall at-spi2-registryd >> $@
9 @echo . $(srcdir)/run-xvfb.sh >> $@
10 @echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@
11 @chmod +x $@
12@@ -155,7 +154,6 @@
13 libappindicator-tests: libappindicator-tests-gtester Makefile.am
14 @echo "#!/bin/bash" > $@
15 @echo export DISPLAY= >> $@
16- @echo killall at-spi2-registryd >> $@
17 @echo . $(srcdir)/run-xvfb.sh >> $@
18 @echo export UBUNTU_MENUPROXY= >> $@
19 @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@
20@@ -175,7 +173,6 @@
21 test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
22 @echo "#!/bin/bash" > test-libappindicator-dbus
23 @echo export DISPLAY= >> $@
24- @echo killall at-spi2-registryd >> $@
25 @echo . $(srcdir)/run-xvfb.sh >> $@
26 @echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus
27 @chmod +x test-libappindicator-dbus
28@@ -186,7 +183,6 @@
29 test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
30 @echo "#!/bin/bash" > test-libappindicator-status
31 @echo export DISPLAY= >> $@
32- @echo killall at-spi2-registryd >> $@
33 @echo . $(srcdir)/run-xvfb.sh >> $@
34 @echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
35 @chmod +x test-libappindicator-status

Subscribers

People subscribed via source and target branches