Skip to content

sapi/cli/tests: use kill -0 in pdeathsig test #24413

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

Open
Sjord wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
Open

sapi/cli/tests: use kill -0 in pdeathsig test #24413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions sapi/cli/tests/php_cli_server_pdeathsig.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ if (!(str_contains(PHP_OS, 'Linux') || str_contains(PHP_OS, 'FreeBSD'))) {
die('skip PDEATHSIG is only supported on Linux and FreeBSD');
}
if (@file_exists('/.dockerenv')) die("skip Broken in Docker");
if (!shell_exec("which pgrep")) die("skip Missing pgrep command");
if (!function_exists('shell_exec')) die("skip shell_exec() is not available");
if (!shell_exec("command -v pgrep")) die("skip Missing pgrep command");
?>
--FILE--
<?php
Expand All @@ -23,7 +24,13 @@ function find_workers_by_ppid(string $ppid) {
}

function find_workers_by_pids(array $pids) {
return split_words(shell_exec('ps -o pid= -p ' . join(',', $pids)));
$workers = [];
foreach ($pids as $pid) {
if (shell_exec('kill -0 ' . (int) $pid . ' 2>/dev/null && echo 1') !== null) {
$workers[] = $pid;
}
}
return $workers;
}

include "php_cli_server.inc";
Expand Down
Loading