From 38d5c213c15535154c99a7e5976def346c37293f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2008 13:16:32 +0200 Subject: [PATCH] Fix problem where test case timeout was not detected after expected crash server restart. The test timeout process was killed not restarted. --- mysql-test/mysql-test-run.pl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9cfd4d71908..6f0d79e5c06 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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 # ----------------------------------------------------