Merge lp:~ted/dbus-test-runner/kill-dbus into lp:dbus-test-runner/0.1

Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/dbus-test-runner/kill-dbus
Merge into: lp:dbus-test-runner/0.1
Diff against target: 26 lines (+5/-1)
2 files modified
po/Makefile.in.in (+1/-1)
src/dbus-test-runner.c (+4/-0)
To merge this branch: bzr merge lp:~ted/dbus-test-runner/kill-dbus
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+15614@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Explicitly ensuring the dbus-daemon goes away.

Revision history for this message
Neil J. Patel (njpatel) wrote :

Killing the bus? No waaaaay.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/Makefile.in.in'
2--- po/Makefile.in.in 2009-08-19 16:59:30 +0000
3+++ po/Makefile.in.in 2009-12-03 16:25:24 +0000
4@@ -129,7 +129,7 @@
5 done
6
7 # Empty stubs to satisfy archaic automake needs
8-dvi info tags TAGS ID:
9+dvi info ctags tags CTAGS TAGS ID:
10
11 # Define this as empty until I found a useful application.
12 install-exec installcheck:
13
14=== modified file 'src/dbus-test-runner.c'
15--- src/dbus-test-runner.c 2009-12-02 22:58:02 +0000
16+++ src/dbus-test-runner.c 2009-12-03 16:25:24 +0000
17@@ -331,5 +331,9 @@
18 global_mainloop = g_main_loop_new(NULL, FALSE);
19 g_main_loop_run(global_mainloop);
20
21+ gchar * killline = g_strdup_printf("kill -9 %d", dbus);
22+ g_spawn_command_line_sync(killline, NULL, NULL, NULL, NULL);
23+ g_free(killline);
24+
25 return !global_success;
26 }

Subscribers

People subscribed via source and target branches