Show More
@@ -383,8 +383,8 b' def terminate(proc):' | |||
|
383 | 383 | except OSError: |
|
384 | 384 | pass |
|
385 | 385 | |
|
386 | def killdaemons(): | |
|
387 |
return killmod.killdaemons( |
|
|
386 | def killdaemons(pidfile): | |
|
387 | return killmod.killdaemons(pidfile, tryhard=False, remove=True, | |
|
388 | 388 | logfn=vlog) |
|
389 | 389 | |
|
390 | 390 | def cleanup(options): |
@@ -806,7 +806,7 b' def run(cmd, wd, options, replacements, ' | |||
|
806 | 806 | ret = proc.wait() |
|
807 | 807 | if ret == 0: |
|
808 | 808 | ret = signal.SIGTERM << 8 |
|
809 | killdaemons() | |
|
809 | killdaemons(env['DAEMON_PIDS']) | |
|
810 | 810 | return ret |
|
811 | 811 | |
|
812 | 812 | output = '' |
@@ -827,7 +827,7 b' def run(cmd, wd, options, replacements, ' | |||
|
827 | 827 | ret = 'timeout' |
|
828 | 828 | |
|
829 | 829 | if ret: |
|
830 | killdaemons() | |
|
830 | killdaemons(env['DAEMON_PIDS']) | |
|
831 | 831 | |
|
832 | 832 | for s, r in replacements: |
|
833 | 833 | output = re.sub(s, r, output) |
@@ -940,7 +940,7 b' def runone(options, test):' | |||
|
940 | 940 | times.append((test, endtime - starttime)) |
|
941 | 941 | vlog("# Ret was:", ret) |
|
942 | 942 | |
|
943 | killdaemons() | |
|
943 | killdaemons(env['DAEMON_PIDS']) | |
|
944 | 944 | |
|
945 | 945 | skipped = (ret == SKIPPED_STATUS) |
|
946 | 946 |
General Comments 0
You need to be logged in to leave comments.
Login now