diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-28 13:02:19 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-28 13:02:19 +0100 |
| commit | 314fb8f62e54a062d16fabc421d99c68c9a89179 (patch) | |
| tree | 4cf81182b5cf94d75939043fb4508d83b6c3bab0 /mysql-test/lib/v1/mysql-test-run.pl | |
| parent | 6ffad4ad8e10e57989ba95be4264974c56825682 (diff) | |
| parent | 480054c64d39c840756cb7dbece5e951d7d1006c (diff) | |
| download | mariadb-git-314fb8f62e54a062d16fabc421d99c68c9a89179.tar.gz | |
upmerge 49210
Diffstat (limited to 'mysql-test/lib/v1/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index c90c4c30e00..3ea815cb45a 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -1107,14 +1107,16 @@ 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; $opt_testcase_timeout*= 10 if ($opt_debug and $glob_win32); } 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; $opt_suite_timeout*= 6 if ($opt_debug and $glob_win32); } |