1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #46882 Suite timeout doesn't kill stray processes

Browse Source 
Kill mysqltest and call mtr_kill_leftovers() before terminating
This commit is contained in:
Bjorn Munch 2010-06-14 11:26:42 +02:00
parent 41297909ad
commit b18902fd59
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/lib/mtr_process.pl
View File

@ -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" )