diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-27 15:21:41 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-27 15:21:41 +0100 |
| commit | b13ed2975d2c7be450596b429020b0b91af1dbf9 (patch) | |
| tree | 982252adc946212749f88d6fe80e7a1fdbcf28d8 /mysql-test | |
| parent | 694d50c71efc079c794fc81fb13d49ce5036ce36 (diff) | |
| download | mariadb-git-b13ed2975d2c7be450596b429020b0b91af1dbf9.tar.gz | |
Bug #49210 Enable MTR timeout configuration through environment variables
Define env. vars for both timeout settings
This patch is for 5.0 (mtr v1) and should replaces for 5.1 up
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e98e05eadb1..01094f40956 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; } |