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>
John Paul Adrian Glaubitz committed
May 20, 2024 at 15:01 UTC
45db5ed3b2f9f1c4768633f3d691bbe1305cf9ca
1 file changed
+1
-1
t/chainlint.pl
+1
-1
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