1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtr on FreeBSD detects core count for --parallel=auto

Browse Source
This commit is contained in:
Dave Gosselin 2024-05-15 09:50:11 -04:00 committed by Daniel Black
parent 32ee6670a5
commit 4911ec1a5b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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 IS_MAC our @EXPORT= qw(IS_CYGWIN IS_MSYS IS_WINDOWS IS_WIN32PERL IS_AIX IS_MAC IS_FREEBSD
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);
@ -79,6 +79,15 @@ BEGIN {
} }
} }
BEGIN {
if ($^O eq "freebsd") {
eval 'sub IS_FREEBSD { 1 }';
}
else {
eval 'sub IS_FREEBSD { 0 }';
}
}
# #
# native_path # native_path
# Convert from path format used by perl to the underlying # Convert from path format used by perl to the underlying

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

@ -427,7 +427,7 @@ sub main {
{ {
$opt_parallel= $ENV{NUMBER_OF_PROCESSORS} || 1; $opt_parallel= $ENV{NUMBER_OF_PROCESSORS} || 1;
} }
elsif (IS_MAC) elsif (IS_MAC || IS_FREEBSD)
{ {
$opt_parallel= `sysctl -n hw.ncpu`; $opt_parallel= `sysctl -n hw.ncpu`;
} }