diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 15:37:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 15:51:30 +0200 |
| commit | c9ec1cc751df936d3359e0705f4341a814b2b4fa (patch) | |
| tree | e1ed643823118af2d254a23878932c8f1e9965b8 /mysql-test/mysql-test-run.pl | |
| parent | a66eebf57c212363f9f430a4c8c9a4f3ddf57cfb (diff) | |
| parent | 328edf8560dbf1941ce314fa112e0db05d9f97f1 (diff) | |
| download | mariadb-git-c9ec1cc751df936d3359e0705f4341a814b2b4fa.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ec6af7c1171..5cf41b65461 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2,7 +2,7 @@ # -*- cperl -*- # Copyright (c) 2004, 2014, Oracle and/or its affiliates. -# Copyright (c) 2009, 2018, MariaDB Corporation +# Copyright (c) 2009, 2020, MariaDB Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -614,7 +614,8 @@ sub main { else { my $sys_info= My::SysInfo->new(); - $opt_parallel= $sys_info->num_cpus(); + $opt_parallel= $sys_info->num_cpus() + + int($sys_info->min_bogomips()/500) - 4; for my $limit (2000, 1500, 1000, 500){ $opt_parallel-- if ($sys_info->min_bogomips() < $limit); } |