diff options
| author | John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> | 2024-05-20 15:01:30 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-22 11:58:40 -0700 |
| commit | 45db5ed3b2f9f1c4768633f3d691bbe1305cf9ca (patch) | |
| tree | 6a6fa5fed5fb655f1cd1ca013faa993cbd27362d /t/chainlint.pl | |
| parent | 037348e99ada4d819460326c21d6cebe6338bfe6 (diff) | |
| download | git-45db5ed3b2f9f1c4768633f3d691bbe1305cf9ca.tar.gz | |
chainlint.pl: fix incorrect CPU count on Linux SPARC
On SPARC systems running Linux, individual processors are denoted with
"CPUnn:" in /proc/cpuinfo instead of the usual "processor : NN". As a
result, the regexp in ncores() matches 0 times. Address this shortcoming
by extending the regexp to also match lines with "CPUnn:".
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
[es: simplified regexp; tweaked commit message]
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/chainlint.pl')
| -rwxr-xr-x | t/chainlint.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/chainlint.pl b/t/chainlint.pl index 28e2506032..ea154a206a 100755 --- a/t/chainlint.pl +++ b/t/chainlint.pl @@ -715,7 +715,7 @@ sub ncores { if (open my $fh, '<', '/proc/cpuinfo') { my $cpuinfo = do { local $/; <$fh> }; close($fh); - my @matches = ($cpuinfo =~ /^processor[\s\d]*:/mg); + my @matches = ($cpuinfo =~ /^(processor|CPU)[\s\d]*:/mg); return @matches ? scalar(@matches) : 1; } # macOS & BSD |