diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-28 16:54:36 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-28 16:54:36 +0200 |
| commit | 95190db84d0e3afe43793f08ed5289b3510c0eee (patch) | |
| tree | 501634d4e1bd11c12bfca614f03a685c455535b5 | |
| parent | 81c25abd251014e32452da30c3d18afa73dc64af (diff) | |
| parent | 6e886f07a8f8cdad8ffb056d6133b49a79a0d216 (diff) | |
| download | php-git-95190db84d0e3afe43793f08ed5289b3510c0eee.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | sapi/cli/tests/cli_process_title_unix.phpt | 7 |
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) { |