bzr commit into mysql-5.0-bugteam branch (Bjorn.Munch:2841) Bug#49210

[Bjorn Munch]

#At file:///home/bm136801/my/timenv-50/ based on revid:ramil@stripped

 2841 Bjorn Munch	2010-01-22
      Bug #49210 Enable MTR timeout configuration through environment variables
      Define env. vars for both timeout settings
      This patch is for 5.0 (mtr v1); it does not replace 
         the previous patch which is for 5.1 (mtr v2)

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-09-02 13:36:52 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-01-22 11:32:36 +0000
@@ -1077,13 +1077,15 @@ sub command_line_setup () {
 
   if ( ! $opt_testcase_timeout )
   {
-    $opt_testcase_timeout= $default_testcase_timeout;
+    $opt_testcase_timeout=
+      $ENV{MTR_TESTCASE_TIMEOUT} || $default_testcase_timeout;
     $opt_testcase_timeout*= 10 if $opt_valgrind;
   }
 
   if ( ! $opt_suite_timeout )
   {
-    $opt_suite_timeout= $default_suite_timeout;
+    $opt_suite_timeout=
+      $ENV{MTR_SUITE_TIMEOUT} || $default_suite_timeout;
     $opt_suite_timeout*= 6 if $opt_valgrind;
   }
 


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