chainlint.pl: fix incorrect CPU count on Linux SPARC

glaubitz · gitster · commit 45db5ed3b2f9 · 2024-05-22T11:58:40.000-07:00
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 &lt;glaubitz@physik.fu-berlin.de&gt;
[es: simplified regexp; tweaked commit message]
Signed-off-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Tested-by: John Paul Adrian Glaubitz  &lt;glaubitz@physik.fu-berlin.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ sub ncores {`
`715`	`715`	`if (open my $fh, '<', '/proc/cpuinfo') {`
`716`	`716`	`my $cpuinfo = do { local $/; <$fh> };`
`717`	`717`	`close($fh);`
`718`		`- my @matches = ($cpuinfo =~ /^processor[\s\d]*:/mg);`
	`718`	`+ my @matches = ($cpuinfo =~ /^(processor\|CPU)[\s\d]*:/mg);`
`719`	`719`	`return @matches ? scalar(@matches) : 1;`
`720`	`720`	`}`
`721`	`721`	`# macOS & BSD`