bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2866) Bug#49210

[Bjorn Munch]

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

 2866 Bjorn Munch	2009-12-04
      Bug #49210 Enable MTR timeout configuration through environment variables
      Define env. vars for all the timeout settings

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-11-26 10:34:16 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-12-04 12:33:19 +0000
@@ -198,10 +198,10 @@ my $opt_mark_progress;
 
 my $opt_sleep;
 
-my $opt_testcase_timeout=    15; # minutes
-my $opt_suite_timeout   =   300; # minutes
-my $opt_shutdown_timeout=    10; # seconds
-my $opt_start_timeout   =   180; # seconds
+my $opt_testcase_timeout= $ENV{MTR_TESTCASE_TIMEOUT} ||  15; # minutes
+my $opt_suite_timeout   = $ENV{MTR_SUITE_TIMEOUT}    || 300; # minutes
+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; };


Attachment: [text/bzr-bundle] bzr/[e-mail]