mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Fix problem where test case timeout was not detected
after expected crash server restart. The test timeout process was killed not restarted.
This commit is contained in:
parent
4bdec18f75
commit
38d5c213c1
1 changed files with 8 additions and 5 deletions
|
@ -2405,16 +2405,14 @@ sub run_testcase ($) {
|
|||
}
|
||||
mtr_verbose("Got $proc");
|
||||
|
||||
# ----------------------------------------------------
|
||||
# Stop the test case timer
|
||||
# ----------------------------------------------------
|
||||
$test_timeout_proc->kill();
|
||||
|
||||
# ----------------------------------------------------
|
||||
# Was it the test program that exited
|
||||
# ----------------------------------------------------
|
||||
if ($proc eq $test)
|
||||
{
|
||||
# Stop the test case timer
|
||||
$test_timeout_proc->kill();
|
||||
|
||||
my $res= $test->exit_status();
|
||||
|
||||
if ( $res == 0 )
|
||||
|
@ -2488,6 +2486,11 @@ sub run_testcase ($) {
|
|||
next;
|
||||
}
|
||||
|
||||
# ----------------------------------------------------
|
||||
# Stop the test case timer
|
||||
# ----------------------------------------------------
|
||||
$test_timeout_proc->kill();
|
||||
|
||||
# ----------------------------------------------------
|
||||
# It's not mysqltest that has exited, kill it
|
||||
# ----------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue