Fix problem where test case timeout was not detected

after expected crash server restart. The test timeout process was killed
not restarted.
parent 0ceb3244
...@@ -2405,16 +2405,14 @@ sub run_testcase ($) { ...@@ -2405,16 +2405,14 @@ sub run_testcase ($) {
} }
mtr_verbose("Got $proc"); mtr_verbose("Got $proc");
# ----------------------------------------------------
# Stop the test case timer
# ----------------------------------------------------
$test_timeout_proc->kill();
# ---------------------------------------------------- # ----------------------------------------------------
# Was it the test program that exited # Was it the test program that exited
# ---------------------------------------------------- # ----------------------------------------------------
if ($proc eq $test) if ($proc eq $test)
{ {
# Stop the test case timer
$test_timeout_proc->kill();
my $res= $test->exit_status(); my $res= $test->exit_status();
if ( $res == 0 ) if ( $res == 0 )
...@@ -2488,6 +2486,11 @@ sub run_testcase ($) { ...@@ -2488,6 +2486,11 @@ sub run_testcase ($) {
next; next;
} }
# ----------------------------------------------------
# Stop the test case timer
# ----------------------------------------------------
$test_timeout_proc->kill();
# ---------------------------------------------------- # ----------------------------------------------------
# It's not mysqltest that has exited, kill it # It's not mysqltest that has exited, kill it
# ---------------------------------------------------- # ----------------------------------------------------
......
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