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/mysql-test-run.pl | |
| parent | 6ffad4ad8e10e57989ba95be4264974c56825682 (diff) | |
| parent | 480054c64d39c840756cb7dbece5e951d7d1006c (diff) | |
| download | mariadb-git-314fb8f62e54a062d16fabc421d99c68c9a89179.tar.gz | |
upmerge 49210
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f73c91afe14..94a842bdc00 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -223,10 +223,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; }; |