database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-33078 SysInfo.pm reports incorrect CPU count on macOS

Browse Source 
When running on macOS, MTR will ask the operating system for the core count when --parallel=auto
This commit is contained in:
Dave Gosselin
2024-05-02 11:44:02 -04:00
committed by Daniel Black
parent 7ed9d2ac00
commit 89084c2ea4
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/lib/My/Platform.pm
View File

@ -23,7 +23,7 @@ use File::Path;
use Carp; use Carp;
use base qw(Exporter); use base qw(Exporter);
our @EXPORT= qw(IS_CYGWIN IS_MSYS IS_WINDOWS IS_WIN32PERL IS_AIX our @EXPORT= qw(IS_CYGWIN IS_MSYS IS_WINDOWS IS_WIN32PERL IS_AIX IS_MAC
native_path posix_path mixed_path native_path posix_path mixed_path
check_socket_path_length process_alive open_for_append); check_socket_path_length process_alive open_for_append);
@ -70,6 +70,14 @@ BEGIN {
} }
} }
BEGIN {
if ($^O eq "darwin") {
eval 'sub IS_MAC { 1 }';
}
else {
eval 'sub IS_MAC { 0 }';
}
}
# #
# native_path # native_path

4
mysql-test/mysql-test-run.pl
View File

@ -427,6 +427,10 @@ sub main {
{ {
$opt_parallel= $ENV{NUMBER_OF_PROCESSORS} || 1; $opt_parallel= $ENV{NUMBER_OF_PROCESSORS} || 1;
} }
elsif (IS_MAC)
{
$opt_parallel= `sysctl -n hw.ncpu`;
}
else else
{ {
my $sys_info= My::SysInfo->new(); my $sys_info= My::SysInfo->new();