Bug #46882 Suite timeout doesn't kill stray processes
Kill mysqltest and call mtr_kill_leftovers() before terminating
This commit is contained in:
parent
41297909ad
commit
b18902fd59
@ -264,8 +264,9 @@ sub spawn_parent_impl {
|
|||||||
if ( $timer_name eq "suite" )
|
if ( $timer_name eq "suite" )
|
||||||
{
|
{
|
||||||
# We give up here
|
# We give up here
|
||||||
# FIXME we should only give up the suite, not all of the run?
|
|
||||||
print STDERR "\n";
|
print STDERR "\n";
|
||||||
|
kill(9, $pid); # Kill mysqltest
|
||||||
|
mtr_kill_leftovers(); # Kill servers the hard way
|
||||||
mtr_error("Test suite timeout");
|
mtr_error("Test suite timeout");
|
||||||
}
|
}
|
||||||
elsif ( $timer_name eq "testcase" )
|
elsif ( $timer_name eq "testcase" )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user