diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-28 15:19:18 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-28 15:19:18 +0100 |
| commit | cf72d8679a08317d3d5cb8d1338c9cafab67a961 (patch) | |
| tree | 88916b7b16a9c11a5233ac90901802efa348c71e /mysql-test/mysql-test-run.pl | |
| parent | efd5ecb0e07472682f89a8570200713689faf48c (diff) | |
| download | mariadb-git-cf72d8679a08317d3d5cb8d1338c9cafab67a961.tar.gz | |
merge 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 99d4774866f..a2ea36aa34e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -206,10 +206,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; }; |