From: Bjorn Munch
Date: August 30 2010 9:25am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2926) Bug#55178
List-Archive: http://lists.mysql.com/commits/117121
X-Bug: 55178
Message-Id: <201008300925.o7U9PkJI008436@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0683701761=="

--===============0683701761==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/testto-51/ based on revid:bjorn.munch@stripped

 2926 Bjorn Munch	2010-08-30
      Bug #55178 Set timeout on test-to-test-basis
      Allow --testcase-timeout=<mins> to be set in .opt file for test

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2010-08-04 10:19:51 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2010-08-30 09:25:10 +0000
@@ -684,6 +684,13 @@ sub process_opts_file {
 	next;
       }
 
+      $value= mtr_match_prefix($opt, "--testcase-timeout=");
+      if ( defined $value ) {
+	# Overrides test case timeout for this test
+	$tinfo->{'case-timeout'}= $value;
+	next;
+      }
+
       # Ok, this was a real option, add it
       push(@{$tinfo->{$opt_name}}, $opt);
     }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-08-04 10:19:51 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-08-30 09:25:10 +0000
@@ -212,7 +212,6 @@ my $opt_suite_timeout   = $ENV{MTR_SUITE
 my $opt_shutdown_timeout= $ENV{MTR_SHUTDOWN_TIMEOUT} ||  10; # seconds
 my $opt_start_timeout   = $ENV{MTR_START_TIMEOUT}    || 180; # seconds
 
-sub testcase_timeout { return $opt_testcase_timeout * 60; };
 sub suite_timeout { return $opt_suite_timeout * 60; };
 sub check_timeout { return $opt_testcase_timeout * 6; };
 
@@ -241,6 +240,17 @@ my $opt_callgrind;
 my %mysqld_logs;
 my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
 
+sub testcase_timeout ($) {
+  my ($tinfo)= @_;
+  if (exists $tinfo->{'case-timeout'}) {
+    # Return test specific timeout if *longer* that the general timeout
+    my $test_to= $tinfo->{'case-timeout'};
+    $test_to*= 10 if $opt_valgrind;
+    return $test_to * 60 if $test_to > $opt_testcase_timeout;
+  }
+  return $opt_testcase_timeout * 60;
+}
+
 our $opt_warnings= 1;
 
 our $opt_skip_ndbcluster= 0;
@@ -3469,7 +3479,7 @@ sub run_testcase ($) {
     }
   }
 
-  my $test_timeout= start_timer(testcase_timeout());
+  my $test_timeout= start_timer(testcase_timeout($tinfo));
 
   do_before_run_mysqltest($tinfo);
 
@@ -3669,7 +3679,7 @@ sub run_testcase ($) {
     {
       my $log_file_name= $opt_vardir."/log/".$tinfo->{shortname}.".log";
       $tinfo->{comment}=
-        "Test case timeout after ".testcase_timeout().
+        "Test case timeout after ".testcase_timeout($tinfo).
 	  " seconds\n\n";
       # Add 20 last executed commands from test case log file
       if  (-e $log_file_name)
@@ -3678,7 +3688,7 @@ sub run_testcase ($) {
 	   "== $log_file_name == \n".
 	     mtr_lastlinesfromfile($log_file_name, 20)."\n";
       }
-      $tinfo->{'timeout'}= testcase_timeout(); # Mark as timeout
+      $tinfo->{'timeout'}= testcase_timeout($tinfo); # Mark as timeout
       run_on_all($tinfo, 'analyze-timeout');
 
       report_failure_and_restart($tinfo);


--===============0683701761==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/testto-51/
# testament_sha1: 6101fb42075cec2f6c161b796df8b82d73f7a046
# timestamp: 2010-08-30 11:25:46 +0200
# base_revision_id: bjorn.munch@stripped\
#   vu3vpgpkbzsuuyj8
# 
# Begin bundle
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


--===============0683701761==--