From: Bjorn Munch
Date: August 9 2010 2:56pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2924) Bug#55178
List-Archive: http://lists.mysql.com/commits/115336
X-Bug: 55178
Message-Id: <201008091456.o79EueBF004409@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1377632836=="

--===============1377632836==
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.bunch@stripped

 2924 Bjorn Munch	2010-08-09
      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-09 14:55:35 +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-09 14:55:35 +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);


--===============1377632836==
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: f30e47f23b8813e2745b7b5d1855e90f9c9d6eae
# timestamp: 2010-08-09 16:56:40 +0200
# base_revision_id: bjorn.bunch@stripped\
#   e1t12peapcte4egd
# 
# Begin bundle
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
bF6Br73Wh/i7kinChIQEVu0o


--===============1377632836==--