summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorsayantan.dutta@oracle.com <>2013-02-05 11:58:21 +0530
committersayantan.dutta@oracle.com <>2013-02-05 11:58:21 +0530
commit1e25fc77d3a51f1dcfcf1cff76d13df67b22f8dd (patch)
tree2b868c7351a64feb5c6361a8575b2a7d8383fb47 /mysql-test/mysql-test-run.pl
parent66eb0c6e9878941bdc5b5ce4f6fb1b6861f3368a (diff)
downloadmariadb-git-1e25fc77d3a51f1dcfcf1cff76d13df67b22f8dd.tar.gz
BUG #13625278 - PB2 SHOULD PROVIDE MORE USEFUL INFORMATION FOR TIMEOUTS
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl18
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