diff options
author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-05 13:08:10 +0200 |
---|---|---|
committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-05 13:08:10 +0200 |
commit | 861cf983fc1ad93d72cc972b88fbc856df9fb6f0 (patch) | |
tree | 94198c0d245bbd03d45362650515027f8f4e01a8 /mysql-test/mysql-test-run.pl | |
parent | 28b190b2725fbf1b35d3544e96b12fa566f3e95f (diff) | |
download | mariadb-git-861cf983fc1ad93d72cc972b88fbc856df9fb6f0.tar.gz |
Bug #47243 Allow MTR to read max auto setting for --parallel from env. variable
In stead of hard-coded 8, read from $MTR_MAX_PARALLEL if set
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 114b6c84aa3..b3acebbfc44 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -322,7 +322,8 @@ sub main { for my $limit (2000, 1500, 1000, 500){ $opt_parallel-- if ($sys_info->min_bogomips() < $limit); } - $opt_parallel= 8 if ($opt_parallel > 8); + my $max_par= $ENV{MTR_MAX_PARALLEL} || 8; + $opt_parallel= $max_par if ($opt_parallel > $max_par); $opt_parallel= $num_tests if ($opt_parallel > $num_tests); $opt_parallel= 1 if (IS_WINDOWS and $sys_info->isvm()); $opt_parallel= 1 if ($opt_parallel < 1); |