Light Display Manager

Merge lp:~robert-ancell/lightdm/test-runner-remove-source into lp:lightdm

  1. test-runner-remove-source
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1911
Merged at revision: 1911
Proposed branch: lp:~robert-ancell/lightdm/test-runner-remove-source
Merge into: lp:lightdm
Diff against target: 15 lines (+3/-0)
1 file modified
tests/src/test-runner.c (+3/-0)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/test-runner-remove-source
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+209344@code.launchpad.net

Commit message

Remove kill timeout source

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/src/test-runner.c'
2--- tests/src/test-runner.c 2014-02-26 23:35:33 +0000
3+++ tests/src/test-runner.c 2014-03-04 22:33:43 +0000
4@@ -134,9 +134,12 @@
5 {
6 Process *process = data;
7
8+ process->kill_timeout = 0;
9+
10 if (getenv ("DEBUG"))
11 g_print ("Sending SIGKILL to process %d\n", process->pid);
12 kill (process->pid, SIGKILL);
13+
14 return FALSE;
15 }
16

Subscribers

People subscribed via source and target branches