Bug #49210 Enable MTR timeout configuration through environment variables

Bjorn Munch · Bjorn Munch · commit 6e351da89bc3 · 2010-01-27T15:21:41.000+01:00
Define env. vars for both timeout settings
  This patch is for 5.0 (mtr v1) and should replaces for 5.1 up
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -1077,13 +1077,15 @@ ()
 
   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;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1077,13 +1077,15 @@ ()`
`1077`	`1077`
`1078`	`1078`	`if ( ! $opt_testcase_timeout )`
`1079`	`1079`	`{`
`1080`		`- $opt_testcase_timeout= $default_testcase_timeout;`
	`1080`	`+ $opt_testcase_timeout=`
	`1081`	`+ $ENV{MTR_TESTCASE_TIMEOUT} \|\| $default_testcase_timeout;`
`1081`	`1082`	`$opt_testcase_timeout*= 10 if $opt_valgrind;`
`1082`	`1083`	`}`
`1083`	`1084`
`1084`	`1085`	`if ( ! $opt_suite_timeout )`
`1085`	`1086`	`{`
`1086`		`- $opt_suite_timeout= $default_suite_timeout;`
	`1087`	`+ $opt_suite_timeout=`
	`1088`	`+ $ENV{MTR_SUITE_TIMEOUT} \|\| $default_suite_timeout;`
`1087`	`1089`	`$opt_suite_timeout*= 6 if $opt_valgrind;`
`1088`	`1090`	`}`
`1089`	`1091`