diff options
| author | Bernhard Urban <bernhard.urban@xamarin.com> | 2018-11-01 02:42:37 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-11-01 02:42:37 +0300 |
| commit | e1c6c78158cca4ef9732e6ac995af08076e5ce01 (patch) | |
| tree | 9f956db627549a3f9aff2bb1c634557afbb8715d /scripts/ci | |
| parent | e67699917c31201bf8e95c22a0751266a98fe607 (diff) | |
[ci babysitter] Add more output around timeout killing machinery (#11463)
Diffstat (limited to 'scripts/ci')
| -rwxr-xr-x | scripts/ci/babysitter | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/ci/babysitter b/scripts/ci/babysitter index c8be5c839d2..8ec3579e0b9 100755 --- a/scripts/ci/babysitter +++ b/scripts/ci/babysitter @@ -364,13 +364,19 @@ def run(): # Returns exit code code = wait(proc, duration) timed_out = code is None if timed_out: # Initial timeout + sys.stderr.write("%s: Sending %s to `%s`\n" % (scriptname, "SIG" + args.signal, command[0])) send_signal(proc, timeout_signal) if kill_after is not None: # Kill-after timeout code = wait(proc, kill_after) if code is None: + sys.stderr.write("%s: Sending SIGKILL to `%s`\n" % (scriptname, command[0])) send_signal(proc, signal.SIGKILL) + code = wait(proc, 1) + sys.stderr.write("%s: Command `%s` returned with %s after SIGKILL\n" % (scriptname, command[0], str(code))) + else: + sys.stderr.write("%s: Command `%s` returned with %s after %s\n" % (scriptname, command[0], str(code), "SIG" + args.signal)) code = proc.wait() # Waits forever - sys.stderr.write("%s: Command `%s` timed out\n" % (scriptname, command[0])) + sys.stderr.write("%s: Command `%s` timed out with %s\n" % (scriptname, command[0], str(code))) died_politely = True # The test suite has now run, and what happens next varies: |