Skip to content

Make t/op/magic.t pass on AlmaLinux 8’s kernel. #19691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 13, 2022
Merged

Make t/op/magic.t pass on AlmaLinux 8’s kernel. #19691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3171c5a
Make t/op/magic.t pass on AlmaLinux 8’s kernel.
FGasper May 4, 2022
6fb4859
fixup! Make t/op/magic.t pass on AlmaLinux 8’s kernel.
FGasper May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion t/op/magic.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,21 @@ EOP
open my $rfh, '<', "/proc/$$/cmdline"
or skip "failed to read '/proc/$$/cmdline': $!", $skip;
my $got = do { local $/; <$rfh> };
$got=~s/\0\z//;

# Some kernels leave a trailing NUL on. Some add a bunch of spaces
# after that NUL. We want neither.
#
# A selection of kernels/distros tested:
#
# 4.18.0-348.20.1.el8_5.x86_64 (AlmaLinux 8.5): NUL then spaces
# 3.10.0-1160.62.1.el7.x86_64 (CentOS 7.9.2009): no NUL nor spaces
# 2.6.32-954.3.5.lve1.4.87.el6.x86_64 (CloudLinux 6.10): ^^ ditto
#
# 5.13.0-1025-raspi (Ubuntu 21.10): NUL only
# 5.10.103-v7+ (RaspiOS 10): NUL only
#
$got=~s/\0\s*\z//;

return $got;
};

Expand Down