diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-14 11:26:42 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-14 11:26:42 +0200 |
| commit | b18902fd59596bfc0b0a0417953bbd312be8bcaa (patch) | |
| tree | 481730c20ac707afd4659fc763092d3b7270fb67 /mysql-test/lib/mtr_process.pl | |
| parent | 41297909aded820350afaecf64a4aee888bd369c (diff) | |
| download | mariadb-git-b18902fd59596bfc0b0a0417953bbd312be8bcaa.tar.gz | |
Bug #46882 Suite timeout doesn't kill stray processes
Kill mysqltest and call mtr_kill_leftovers() before terminating
Diffstat (limited to 'mysql-test/lib/mtr_process.pl')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index a60b2822a14..ee5277d39d7 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -264,8 +264,9 @@ sub spawn_parent_impl { if ( $timer_name eq "suite" ) { # We give up here - # FIXME we should only give up the suite, not all of the run? print STDERR "\n"; + kill(9, $pid); # Kill mysqltest + mtr_kill_leftovers(); # Kill servers the hard way mtr_error("Test suite timeout"); } elsif ( $timer_name eq "testcase" ) |