Skip to content
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

adapt to kernel 6.9 pidfd changes #318

Closed
wants to merge 2 commits into from
Closed

adapt to kernel 6.9 pidfd changes #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a8bc3
tests: eliminate use of fgrep
May 17, 2024
5847fb0
tests: fix for kernel 6.9
May 17, 2024
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
2 changes: 1 addition & 1 deletion lib/dialects/linux/tests/case-20-inet6-ffffffff-handling.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ expectation="n[${v6addr}]:$port"
result=1
if "${lsof}" -p "${pid}" -a -d fd -P -n -F n \
| tee -a "${report}" \
| fgrep -q "$expectation"; then
| grep -Fq "$expectation"; then
result=0
fi

Expand Down
3 changes: 2 additions & 1 deletion lib/dialects/linux/tests/case-20-pidfd-pid.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ $TARGET | (
exit 77
fi
line=$($lsof -p $pid -a -d $fd -F pfn| tr '\n' ' ')
if ! fgrep -q "p${pid} f${fd} n[pidfd:$pid]" <<<"$line"; then
if ! grep -Fq "p${pid} f${fd} n[pidfd:$pid]" <<<"$line" &&
! grep -Fq "p${pid} f${fd} npidfd" <<<"$line"; then
$lsof -p $pid -a -d $fd -F pfn
echo
echo $line
Expand Down
Loading