diff options
author | unknown <sayantan.dutta@oracle.com> | 2013-02-05 11:58:21 +0530 |
---|---|---|
committer | unknown <sayantan.dutta@oracle.com> | 2013-02-05 11:58:21 +0530 |
commit | 96e61d668b3ca1171004add91092cce531c2b3b6 (patch) | |
tree | 2b868c7351a64feb5c6361a8575b2a7d8383fb47 | |
parent | 2c5cd271ebc8e5b7993c0820ffdbe9837a074c28 (diff) | |
download | mariadb-git-96e61d668b3ca1171004add91092cce531c2b3b6.tar.gz |
BUG #13625278 - PB2 SHOULD PROVIDE MORE USEFUL INFORMATION FOR TIMEOUTS
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 11280f70161..4b29fba9120 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3622,6 +3622,7 @@ sub run_testcase ($) { my $test= start_mysqltest($tinfo); # Set only when we have to keep waiting after expectedly died server my $keep_waiting_proc = 0; + my $print_timeout= start_timer($print_freq * 60); while (1) { @@ -3646,7 +3647,22 @@ sub run_testcase ($) { } if (! $keep_waiting_proc) { - $proc= My::SafeProcess->wait_any_timeout($test_timeout); + if($test_timeout > $print_timeout) + { + $proc= My::SafeProcess->wait_any_timeout($print_timeout); + if ( $proc->{timeout} ) + { + #print out that the test is still on + mtr_print("Test still running: $tinfo->{name}"); + #reset the timer + $print_timeout= start_timer($print_freq * 60); + next; + } + } + else + { + $proc= My::SafeProcess->wait_any_timeout($test_timeout); + } } # Will be restored if we need to keep waiting |