From: Bjorn Munch
Date: May 25 2011 2:08pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3220) Bug#12590770
List-Archive: http://lists.mysql.com/commits/138080
X-Bug: 12590770
Message-Id: <201105251408.p4PE8t4d016813@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2059297502=="

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

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

 3220 Bjorn Munch	2011-05-25
      Bug #12590770 TEST SPECIFIC TIMEOUT SETTING DOES NOT APPLY TO "CHECK" OR "WARNINGS"
      Replace global check_timeout with one that calls testcase_timeout for the test

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-05-25 08:58:33 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-05-25 14:07:16 +0000
@@ -263,7 +263,6 @@ my $opt_shutdown_timeout= $ENV{MTR_SHUTD
 my $opt_start_timeout   = $ENV{MTR_START_TIMEOUT}    || 180; # seconds
 
 sub suite_timeout { return $opt_suite_timeout * 60; };
-sub check_timeout { return $opt_testcase_timeout * 6; };
 
 my $opt_wait_all;
 my $opt_user_args;
@@ -299,6 +298,8 @@ sub testcase_timeout ($) {
   return $opt_testcase_timeout * 60;
 }
 
+sub check_timeout ($) { return testcase_timeout($_[0]) / 10; }
+
 our $opt_warnings= 1;
 
 our $opt_include_ndbcluster= 0;
@@ -3415,7 +3416,7 @@ sub check_testcase($$)
   # Return immediately if no check proceess was started
   return 0 unless ( keys %started );
 
-  my $timeout= start_timer(check_timeout());
+  my $timeout= start_timer(check_timeout($tinfo));
 
   while (1){
     my $result;
@@ -3487,7 +3488,7 @@ test case was executed:\n";
     }
     elsif ( $proc->{timeout} ) {
       $tinfo->{comment}.= "Timeout for 'check-testcase' expired after "
-	.check_timeout()." seconds";
+	.check_timeout($tinfo)." seconds";
       $result= 4;
     }
     else {
@@ -3577,7 +3578,7 @@ sub run_on_all($$)
   # Return immediately if no check proceess was started
   return 0 unless ( keys %started );
 
-  my $timeout= start_timer(check_timeout());
+  my $timeout= start_timer(check_timeout($tinfo));
 
   while (1){
     my $result;
@@ -3608,7 +3609,7 @@ sub run_on_all($$)
     }
     elsif ($proc->{timeout}) {
       $tinfo->{comment}.= "Timeout for '$run' expired after "
-	.check_timeout()." seconds";
+	.check_timeout($tinfo)." seconds";
     }
     else {
       # Unknown process returned, most likley a crash, abort everything
@@ -4333,7 +4334,7 @@ sub check_warnings ($) {
   # Return immediately if no check proceess was started
   return 0 unless ( keys %started );
 
-  my $timeout= start_timer(check_timeout());
+  my $timeout= start_timer(check_timeout($tinfo));
 
   while (1){
     my $result= 0;
@@ -4385,7 +4386,7 @@ sub check_warnings ($) {
     }
     elsif ( $proc->{timeout} ) {
       $tinfo->{comment}.= "Timeout for 'check warnings' expired after "
-	.check_timeout()." seconds";
+	.check_timeout($tinfo)." seconds";
       $result= 4;
     }
     else {


--===============2059297502==
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/chtime-55/
# testament_sha1: 68b76bbef64cd098a94d85137f3fc63511113ca0
# timestamp: 2011-05-25 16:08:55 +0200
# base_revision_id: bjorn.munch@stripped\
#   7ppf0uysx4rsi3vf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ65vAUAAfLfgAAwXGP//3/v
3qq////6UARZPblNZ1A4atdhJKNBT0xGjQ0mmp+hJ4TQm0JtAE9NIYQ0ElQ0yNBo0TUT0T1HogG0
E9T1GEGEwhkBiQEAmTRoUaejKNGR6gANANNDTQDhppkYjCaYCGATTCMExMhpkaGgEkppqnppiJ6B
6TRlA1MI2U8pkGAEBhMRrP+0bA/UD058gtNBGm9W0GCJH5ylktV1Fc6ITc5mPh4fD+Gyu67ozIJA
Dq+gAk+W1NnEGvT0szcaGCL1BOuRxNDt6uWfqocWOPst+Pptjd6YHeedQ2vV75ZGtRe9xw/DLXou
8HdJouaKtareoUSfpHxNzDJhNZStJ7Ju18gqVZPURk4Fhy0Z/4WOLbtYE6hFsVCRMJYRrjoXnoOF
sbKOml3fMkCHvmHlxasMCHdsGnj9PMHmIHVbwhOmLDI3AXNlVDnOkVdblMIzG3TqjSniGK9rm3mx
695TGTGEBd66D9WOB+YCmjGMPbZ6povIWvWETJhtGceWxq5hnQIQYLVYCHRKYICzMwEBUOS9OmLA
op2wSlaaGpbQ5kxVWzdMzSKfTKz+7BZLDHCvBBSSkpcMkG7sDCmgoaiS0niTE3kQW2K8wwqylvus
vmQbjaTARfMEtgQrjuT3hp/McU54ZMxfxEj3ARZRjchifQYmbjis2Lp8Rf7fA1j55U7OwsFogMkq
JIzwgrWVkY25ywq2KUlUNUXWxrEZPTn2Y0DZOrBSa+vW4OrNoyfKoHDC4XYXTrbVY4irEQheoaWD
2KiniYEZLl3pJRy6DSpGvYt95ho+zVnSJPiGwyY3cR+pHyKH3/ftt8u6T3Px7NAOaiFSHS0etpW0
z661hDqmGh2TeKlCGfs/e359zbrI+3E4cHszCeT4cmboOYzcfLy7JHa+vvSLMXPQ4OQXT17L00NM
qH1AR3WNn+2FsonWAXm6+VdAfcyDPfy49MVGHUkSQta8TLjNGApjl4ELFCfleSokjhwAPJECRA+j
toyWTv3plAs0r7lGsjTZSBQfR4zRcL/C4FnMuXbMW/J01mjHLLeiMTz8oXyitgHlXTRVblaq9dn0
s74ePnUbkyuoXayz1VU17sUUCZg3kYcz6dfI0xpGPrjqL1swDTnFhnwpMpDTKKZFD7KW9hgWQHEr
gMTV3aryCQuLNUbf52JppM5MQTkgp+YUOFywwx7YZQw2OxxDtGY0GvUkcmNhMgtFUE4ot9W2BGF+
II57iQ11uR8uBt6OWZNp0pFYt5TSsAVMQ5SR7zUkV2rXwKmacuskOURoEJOqRIiA8+IIMTOwaCHI
o8W8nGzWAYDnQY28TyT2SOEIlOCtcr95Cq3FxCwUVsyeSSqtSxalCSpwQHLromDgGJO55FlG5hLf
ICtEjB1vORSZRwkHlhdqTqH4iVTm80tpYQemFIrGPnbNWE6JkxKDFLw5HNjeEQNzgxc7kGBfAF11
WOLBggsWFOinm0gmtSK4lFYEAkGyp8WLL4adNC69KQ7G5C9fEqi1alOi5VevzY51kI986XlpiVKh
IRZJoA4StP1u4COxcoP+LuSKcKEgHXN4Cg==


--===============2059297502==--