summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2016-07-28 16:49:45 +0200
committerChristoph M. Becker <cmb@php.net>2016-07-28 16:51:45 +0200
commit6e886f07a8f8cdad8ffb056d6133b49a79a0d216 (patch)
treea52e7335ac2a4970f5faf6d1c076b65e97255ad7
parentee6900c3de68f1b94dfae8e230c7fa755c7fa595 (diff)
downloadphp-git-6e886f07a8f8cdad8ffb056d6133b49a79a0d216.tar.gz
Fix #72676: Test cli_process_title_unix fails on AIX
Patch provided by matthieu dot sarter dot external at atos dot net.
-rw-r--r--sapi/cli/tests/cli_process_title_unix.phpt7
1 files changed, 6 insertions, 1 deletions
diff --git a/sapi/cli/tests/cli_process_title_unix.phpt b/sapi/cli/tests/cli_process_title_unix.phpt
index c2632704c5..659299c1fc 100644
--- a/sapi/cli/tests/cli_process_title_unix.phpt
+++ b/sapi/cli/tests/cli_process_title_unix.phpt
@@ -15,7 +15,12 @@ $pid = getmypid();
if (cli_set_process_title($original_title) === true)
echo "Successfully set title\n";
-$ps_output = shell_exec("ps -p $pid -o command | tail -n 1");
+$ps_process_title_field = "command";
+if (strtoupper(substr(PHP_OS, 0, 3)) == "AIX")
+{
+ $ps_process_title_field = "args";
+}
+$ps_output = shell_exec("ps -p $pid -o $ps_process_title_field | tail -n 1");
if ($ps_output === null)
{