diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
| commit | a45ea00b32a71ef5d123e102a7379f7d79a3dbbb (patch) | |
| tree | 0bf2d7fce335a1c38da55def00c6bfc5304db2ee /mysql-test/mysql-test-run.pl | |
| parent | ad935d47088485c59e6425347307b7b908790e3d (diff) | |
| parent | 619037517f6827131f0f6367df57e28d1b695626 (diff) | |
| download | mariadb-git-a45ea00b32a71ef5d123e102a7379f7d79a3dbbb.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sys_vars.cc
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 02404af5eea..a56ce563fab 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -217,10 +217,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; }; |