Commit 45c5eca0 authored by Bjorn Munch's avatar Bjorn Munch

Bug #46882 Suite timeout doesn't kill stray processes

Kill mysqltest and call mtr_kill_leftovers() before terminating
parent b564aa92
...@@ -264,8 +264,9 @@ sub spawn_parent_impl { ...@@ -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" )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment