diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-29 02:41:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-29 02:41:05 +0100 |
| commit | 8a40cb1e5a0cd758a52877affdc84c024863bf75 (patch) | |
| tree | 1fe3416e1e1c73516f6a075e4454c8b09a212da5 /t/chainlint.pl | |
| parent | Merge branch 'gc/resolve-alternate-symlinks' (diff) | |
| parent | chainlint.pl: fix /proc/cpuinfo regexp (diff) | |
| download | git-8a40cb1e5a0cd758a52877affdc84c024863bf75.tar.xz git-8a40cb1e5a0cd758a52877affdc84c024863bf75.zip | |
Merge branch 'ah/chainlint-cpuinfo-parse-fix'
The format of a line in /proc/cpuinfo that describes a CPU on s390x
looked different from everybody else, and the code in chainlint.pl
failed to parse it.
* ah/chainlint-cpuinfo-parse-fix:
chainlint.pl: fix /proc/cpuinfo regexp
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 4e47e808d0..e966412999 100755 --- a/t/chainlint.pl +++ b/t/chainlint.pl @@ -709,7 +709,7 @@ sub ncores { # Windows return $ENV{NUMBER_OF_PROCESSORS} if exists($ENV{NUMBER_OF_PROCESSORS}); # Linux / MSYS2 / Cygwin / WSL - do { local @ARGV='/proc/cpuinfo'; return scalar(grep(/^processor\s*:/, <>)); } if -r '/proc/cpuinfo'; + do { local @ARGV='/proc/cpuinfo'; return scalar(grep(/^processor[\s\d]*:/, <>)); } if -r '/proc/cpuinfo'; # macOS & BSD return qx/sysctl -n hw.ncpu/ if $^O =~ /(?:^darwin$|bsd)/; return 1; |